1223 files changed, 57851 insertions, 38038 deletions

diff --git a/.gitignore b/.gitignore
index e61ec6f0359..b24edc91282 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 b9c1a3702cf..bc2beee81ad 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/.jshintrc b/.jshintrc
index 90cec5c5961..77f9e9f143d 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -11,18 +11,22 @@
 	"maxparams": 5,
 	"curly": true,
 	"jquery": true,
-	"maxlen": 80,
+	"maxlen": 120,
 	"indent": 4,
 	"browser": true,
 	"globals": {
 		"console": true,
 		"it": true,
-		"itx": true,
+		"xit": true,
 		"expect": true,
 		"describe": true,
 		"beforeEach": true,
 		"afterEach": true,
 		"sinon": true,
-		"fakeServer": true
+		"fakeServer": true,
+		"_": true,
+		"OC": true,
+		"t": true,
+		"n": true
 	}
 }
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 4473cf9056d..57b88568854 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -7,6 +7,7 @@ filter:
         - 'apps/*/l10n/*'
         - 'lib/l10n/*'
         - 'core/js/tests/lib/*.js'
+        - 'core/js/tests/specs/*.js'
         - 'core/js/jquery-1.10.0.min.js'
         - 'core/js/jquery-migrate-1.2.1.min.js'
         - 'core/js/jquery-showpassword.js'
@@ -15,6 +16,7 @@ filter:
         - 'core/js/jquery-ui-1.10.0.custom.js'
         - 'core/js/jquery.inview.js'  
         - 'core/js/jquery.placeholder.js'
+        - 'core/js/underscore.js'
 
         
 imports:
diff --git a/README.md b/README.md
index 3f76c1a4773..032a7e987f2 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Git master: [![Build Status](https://ci.owncloud.org/job/server-master-linux/bad
 Quality: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
 
 ### Installation instructions
-http://doc.owncloud.org/server/5.0/developer_manual/app/gettingstarted.html
+http://doc.owncloud.org/server/6.0/developer_manual/app/index.html
 
 ### Contribution Guidelines
 http://owncloud.org/dev/contribute/
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 99f49188384..f6aa4f0c90e 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -1,10 +1,9 @@
 <?php
 
-// Init owncloud
-
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+\OC::$session->close();
+
 
 // Get data
 $dir = stripslashes($_POST["dir"]);
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index 6a34cbe4ef1..4b4a7f8948d 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 dd7c7dc5571..dd8af39bada 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 c8286bc15ca..2d76b685018 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -1,48 +1,27 @@
 <?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'] : '';
 $dir = \OC\Files\Filesystem::normalizePath($dir);
 $dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
-if (!$dirInfo->getType() === 'dir') {
+if (!$dirInfo || !$dirInfo->getType() === 'dir') {
 	header("HTTP/1.0 404 Not Found");
 	exit();
 }
 
-$doBreadcrumb = isset($_GET['breadcrumb']);
 $data = array();
 $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
 
 $permissions = $dirInfo->getPermissions();
 
-// Make breadcrumb
-if($doBreadcrumb) {
-	$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
-
-	$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-	$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-	$breadcrumbNav->assign('baseURL', $baseUrl);
-
-	$data['breadcrumb'] = $breadcrumbNav->fetchPage();
-}
-
 // make filelist
 $files = \OCA\Files\Helper::getFiles($dir);
 
-$list = new OCP\Template("files", "part.list", "");
-$list->assign('files', $files, false);
-$list->assign('baseURL', $baseUrl, false);
-$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
-$list->assign('isPublic', false);
-$data['files'] = $list->fetchPage();
+$data['directory'] = $dir;
+$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
 $data['permissions'] = $permissions;
 
 OCP\JSON::success(array('data' => $data));
diff --git a/apps/files/ajax/mimeicon.php b/apps/files/ajax/mimeicon.php
index dbb8b60112a..6557ff941ac 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 04a260265c2..0a8dbc24a65 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"]);
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 0187b200759..7d6be59beab 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'], '/\\') : '';
@@ -111,9 +112,8 @@ if($source) {
 	}
 	if($result) {
 		$meta = \OC\Files\Filesystem::getFileInfo($target);
-		$mime=$meta['mimetype'];
-		$id = $meta['fileid'];
-		$eventSource->send('success', array('mime' => $mime, 'size' => \OC\Files\Filesystem::filesize($target), 'id' => $id, 'etag' => $meta['etag']));
+		$data = \OCA\Files\Helper::formatFileInfo($meta);
+		$eventSource->send('success', $data);
 	} else {
 		$eventSource->send('error', array('message' => $l10n->t('Error while downloading %s to %s', array($source, $target))));
 	}
@@ -138,16 +138,7 @@ if($source) {
 
 	if($success) {
 		$meta = \OC\Files\Filesystem::getFileInfo($target);
-		$id = $meta['fileid'];
-		$mime = $meta['mimetype'];
-		$size = $meta['size'];
-		OCP\JSON::success(array('data' => array(
-			'id' => $id,
-			'mime' => $mime,
-			'size' => $size,
-			'content' => $content,
-			'etag' => $meta['etag'],
-		)));
+		OCP\JSON::success(array('data' => \OCA\Files\Helper::formatFileInfo($meta)));
 		exit();
 	}
 }
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index b2b4fb27f74..89c241189d7 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']) : '';
@@ -57,8 +58,8 @@ if(\OC\Files\Filesystem::mkdir($target)) {
 		$path = '/'.$foldername;
 	}
 	$meta = \OC\Files\Filesystem::getFileInfo($path);
-	$id = $meta['fileid'];
-	OCP\JSON::success(array('data' => array('id' => $id)));
+	$meta['type'] = 'dir'; // missing ?!
+	OCP\JSON::success(array('data' => \OCA\Files\Helper::formatFileInfo($meta)));
 	exit();
 }
 
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
deleted file mode 100644
index 6433ddefd69..00000000000
--- a/apps/files/ajax/rawlist.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-// only need filesystem apps
-$RUNTIME_APPTYPES = array('filesystem');
-
-OCP\JSON::checkLoggedIn();
-
-// Load the files
-$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
-if (is_array($mimetypes)) {
-	$mimetypes = array_unique($mimetypes);
-} elseif (is_null($mimetypes)) {
-	$mimetypes = array($_GET['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)) {
-	$files = array_merge($files, \OC\Files\Filesystem::getDirectoryContent($dir, 'httpd/unix-directory'));
-}
-
-if (is_array($mimetypes) && count($mimetypes)) {
-	foreach ($mimetypes as $mimetype) {
-		$files = array_merge($files, \OC\Files\Filesystem::getDirectoryContent($dir, $mimetype));
-	}
-} else {
-	$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;
-}
-
-OC_JSON::success(array('data' => $result));
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index 5b07c306af8..fa3ddace63d 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 5b32b6db9b7..d5d88483801 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/upload.php b/apps/files/ajax/upload.php
index 145f40c50da..b21a9dfba2e 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -20,6 +20,10 @@ if (empty($_POST['dirToken'])) {
 		die();
 	}
 } else {
+	// TODO: ideally this code should be in files_sharing/ajax/upload.php
+	// and the upload/file transfer code needs to be refactored into a utility method
+	// that could be used there
+
 	// return only read permissions for public upload
 	$allowedPermissions = OCP\PERMISSION_READ;
 	$public_directory = !empty($_POST['subdir']) ? $_POST['subdir'] : '/';
@@ -58,6 +62,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)
@@ -137,19 +145,14 @@ if (strpos($dir, '..') === false) {
 						$error = $l->t('The target folder has been moved or deleted.');
 						$errorCode = 'targetnotfound';
 					} else {
-						$result[] = array('status' => 'success',
-							'mime' => $meta['mimetype'],
-							'mtime' => $meta['mtime'],
-							'size' => $meta['size'],
-							'id' => $meta['fileid'],
-							'name' => basename($target),
-							'etag' => $meta['etag'],
-							'originalname' => $files['tmp_name'][$i],
-							'uploadMaxFilesize' => $maxUploadFileSize,
-							'maxHumanFilesize' => $maxHumanFileSize,
-							'permissions' => $meta['permissions'] & $allowedPermissions,
-							'directory' => $directory,
-						);
+						$data = \OCA\Files\Helper::formatFileInfo($meta);
+						$data['status'] = 'success';
+						$data['originalname'] = $files['tmp_name'][$i];
+						$data['uploadMaxFilesize'] = $maxUploadFileSize;
+						$data['maxHumanFilesize'] = $maxHumanFileSize;
+						$data['permissions'] = $meta['permissions'] & $allowedPermissions;
+						$data['directory'] = $directory;
+						$result[] = $data;
 					}
 
 				} else {
@@ -165,19 +168,15 @@ if (strpos($dir, '..') === false) {
 			if ($meta === false) {
 				$error = $l->t('Upload failed. Could not get file info.');
 			} else {
-				$result[] = array('status' => 'existserror',
-					'mime' => $meta['mimetype'],
-					'mtime' => $meta['mtime'],
-					'size' => $meta['size'],
-					'id' => $meta['fileid'],
-					'name' => basename($target),
-					'etag' => $meta['etag'],
-					'originalname' => $files['tmp_name'][$i],
-					'uploadMaxFilesize' => $maxUploadFileSize,
-					'maxHumanFilesize' => $maxHumanFileSize,
-					'permissions' => $meta['permissions'] & $allowedPermissions,
-					'directory' => $directory,
-				);
+				$data = \OCA\Files\Helper::formatFileInfo($meta);
+				$data['permissions'] = $data['permissions'] & $allowedPermissions;
+				$data['status'] = 'existserror';
+				$data['originalname'] = $files['tmp_name'][$i];
+				$data['uploadMaxFilesize'] = $maxUploadFileSize;
+				$data['maxHumanFilesize'] = $maxHumanFileSize;
+				$data['permissions'] = $meta['permissions'] & $allowedPermissions;
+				$data['directory'] = $directory;
+				$result[] = $data;
 			}
 		}
 	}
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 909baca92ea..15a29133789 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 826f72fb0e6..c70db0b5ae4 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,6 +41,7 @@ $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));
 $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 f334f29a939..25ab70af362 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 af863aca33e..1bac5d2b7db 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 00000000000..3ad7d634838
--- /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 c66cd40fb56..b8ff08c1b05 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -27,19 +27,21 @@ 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');
 OCP\Util::addscript('files', 'jquery-visibility');
+OCP\Util::addscript('files', 'breadcrumb');
 OCP\Util::addscript('files', 'filelist');
 
 OCP\App::setActiveNavigationEntry('files_index');
 // Load the files
 $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 $dir = \OC\Files\Filesystem::normalizePath($dir);
-$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
+$dirInfo = \OC\Files\Filesystem::getFileInfo($dir, false);
 // Redirect if directory does not exist
-if (!$dirInfo->getType() === 'dir') {
+if (!$dirInfo || !$dirInfo->getType() === 'dir') {
 	header('Location: ' . OCP\Util::getScriptName() . '');
 	exit();
 }
@@ -59,44 +61,19 @@ if ($isIE8 && isset($_GET['dir'])){
 	exit();
 }
 
-$ajaxLoad = false;
-$files = array();
 $user = OC_User::getUser();
-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();
 
-// Make breadcrumb
-$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
-
-// make breadcrumb und filelist markup
-$list = new OCP\Template('files', 'part.list', '');
-$list->assign('files', $files);
-$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
-$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
-$list->assign('isPublic', false);
-$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-$breadcrumbNav->assign('breadcrumb', $breadcrumb);
-$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
-
+// needed for share init, permissions will be reloaded
+// anyway with ajax load
 $permissions = $dirInfo->getPermissions();
 
 // information about storage capacities
-$storageInfo=OC_Helper::getStorageInfo($dir);
+$storageInfo=OC_Helper::getStorageInfo($dir, $dirInfo);
 $freeSpace=$storageInfo['free'];
 $uploadLimit=OCP\Util::uploadLimit();
-$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir, $freeSpace);
 $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;
@@ -111,20 +88,12 @@ 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
@@ -140,8 +109,5 @@ $tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_
 $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/breadcrumb.js b/apps/files/js/breadcrumb.js
new file mode 100644
index 00000000000..5bc2fac1369
--- /dev/null
+++ b/apps/files/js/breadcrumb.js
@@ -0,0 +1,241 @@
+/**
+* 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 */
+(function() {
+	/**
+	 * Creates an breadcrumb element in the given container
+	 */
+	var BreadCrumb = function(options){
+		this.$el = $('<div class="breadcrumb"></div>');
+		options = options || {};
+		if (options.onClick) {
+			this.onClick = options.onClick;
+		}
+		if (options.onDrop) {
+			this.onDrop = options.onDrop;
+		}
+		if (options.getCrumbUrl) {
+			this.getCrumbUrl = options.getCrumbUrl;
+		}
+	};
+	BreadCrumb.prototype = {
+		$el: null,
+		dir: null,
+
+		lastWidth: 0,
+		hiddenBreadcrumbs: 0,
+		totalWidth: 0,
+		breadcrumbs: [],
+		onClick: null,
+		onDrop: null,
+
+		/**
+		 * Sets the directory to be displayed as breadcrumb.
+		 * This will re-render the breadcrumb.
+		 * @param dir path to be displayed as breadcrumb
+		 */
+		setDirectory: function(dir) {
+			dir = dir || '/';
+			if (dir !== this.dir) {
+				this.dir = dir;
+				this.render();
+			}
+		},
+
+		/**
+		 * Returns the full URL to the given directory
+		 * @param part crumb data as map
+		 * @param index crumb index
+		 * @return full URL
+		 */
+		getCrumbUrl: function(part, index) {
+			return '#';
+		},
+
+		/**
+		 * Renders the breadcrumb elements
+		 */
+		render: function() {
+			var parts = this._makeCrumbs(this.dir || '/');
+			var $crumb;
+			this.$el.empty();
+			this.breadcrumbs = [];
+
+			for (var i = 0; i < parts.length; i++) {
+				var part = parts[i];
+				var $image;
+				var $link = $('<a></a>').attr('href', this.getCrumbUrl(part, i));
+				$link.text(part.name);
+				$crumb = $('<div class="crumb svg"></div>');
+				$crumb.append($link);
+				$crumb.attr('data-dir', part.dir);
+
+				if (part.img) {
+					$image = $('<img class="svg"></img>');
+					$image.attr('src', part.img);
+					$link.append($image);
+				}
+				this.breadcrumbs.push($crumb);
+				this.$el.append($crumb);
+				if (this.onClick) {
+					$crumb.on('click', this.onClick);
+				}
+			}
+			$crumb.addClass('last');
+
+			// in case svg is not supported by the browser we need to execute the fallback mechanism
+			if (!OC.Util.hasSVGSupport()) {
+				OC.Util.replaceSVG(this.$el);
+			}
+
+			// setup drag and drop
+			if (this.onDrop) {
+				this.$el.find('.crumb:not(.last)').droppable({
+					drop: this.onDrop,
+					tolerance: 'pointer'
+				});
+			}
+
+			this._updateTotalWidth();
+			this.resize($(window).width(), true);
+		},
+
+		/**
+		 * Makes a breadcrumb structure based on the given path
+		 * @param dir path to split into a breadcrumb structure
+		 * @return array of map {dir: path, name: displayName}
+		 */
+		_makeCrumbs: function(dir) {
+			var crumbs = [];
+			var pathToHere = '';
+			// trim leading and trailing slashes
+			dir = dir.replace(/^\/+|\/+$/g, '');
+			var parts = dir.split('/');
+			if (dir === '') {
+				parts = [];
+			}
+			// root part
+			crumbs.push({
+				dir: '/',
+				name: '',
+				img: OC.imagePath('core', 'places/home.svg')
+			});
+			for (var i = 0; i < parts.length; i++) {
+				var part = parts[i];
+				pathToHere = pathToHere + '/' + part;
+				crumbs.push({
+					dir: pathToHere,
+					name: part
+				});
+			}
+			return crumbs;
+		},
+
+		_updateTotalWidth: function () {
+			var self = this;
+
+			this.lastWidth = 0;
+
+			// initialize with some extra space
+			this.totalWidth = 64;
+			// FIXME: this class should not know about global elements
+			if ( $('#navigation').length ) {
+				this.totalWidth += $('#navigation').get(0).offsetWidth;
+			}
+			this.hiddenBreadcrumbs = 0;
+
+			for (var i = 0; i < this.breadcrumbs.length; i++ ) {
+				this.totalWidth += $(this.breadcrumbs[i]).get(0).offsetWidth;
+			}
+
+			$.each($('#controls .actions>div'), function(index, action) {
+				self.totalWidth += $(action).get(0).offsetWidth;
+			});
+
+		},
+
+		/**
+		 * Show/hide breadcrumbs to fit the given width
+		 */
+		resize: function (width, firstRun) {
+			var i, $crumb;
+
+			if (width === this.lastWidth) {
+				return;
+			}
+
+			// window was shrinked since last time or first run ?
+			if ((width < this.lastWidth || firstRun) && width < this.totalWidth) {
+				if (this.hiddenBreadcrumbs === 0 && this.breadcrumbs.length > 1) {
+					// start by hiding the first breadcrumb after home,
+					// that one will have extra three dots displayed
+					$crumb = this.breadcrumbs[1];
+					this.totalWidth -= $crumb.get(0).offsetWidth;
+					$crumb.find('a').addClass('hidden');
+					$crumb.append('<span class="ellipsis">...</span>');
+					this.totalWidth += $crumb.get(0).offsetWidth;
+					this.hiddenBreadcrumbs = 2;
+				}
+				i = this.hiddenBreadcrumbs;
+				// hide subsequent breadcrumbs if the space is still not enough
+				while (width < this.totalWidth && i > 1 && i < this.breadcrumbs.length - 1) {
+					$crumb = this.breadcrumbs[i];
+					this.totalWidth -= $crumb.get(0).offsetWidth;
+					$crumb.addClass('hidden');
+					this.hiddenBreadcrumbs = i;
+					i++;
+				}
+			// window is bigger than last time
+			} else if (width > this.lastWidth && this.hiddenBreadcrumbs > 0) {
+				i = this.hiddenBreadcrumbs;
+				while (width > this.totalWidth && i > 0) {
+					if (this.hiddenBreadcrumbs === 1) {
+						// special handling for last one as it has the three dots
+						$crumb = this.breadcrumbs[1];
+						if ($crumb) {
+							this.totalWidth -= $crumb.get(0).offsetWidth;
+							$crumb.find('.ellipsis').remove();
+							$crumb.find('a').removeClass('hidden');
+							this.totalWidth += $crumb.get(0).offsetWidth;
+						}
+					} else {
+						$crumb = this.breadcrumbs[i];
+						$crumb.removeClass('hidden');
+						this.totalWidth += $crumb.get(0).offsetWidth;
+						if (this.totalWidth > width) {
+							this.totalWidth -= $crumb.get(0).offsetWidth;
+							$crumb.addClass('hidden');
+							break;
+						}
+					}
+					i--;
+					this.hiddenBreadcrumbs = i;
+				}
+			}
+
+			this.lastWidth = width;
+		}
+	};
+
+	window.BreadCrumb = BreadCrumb;
+})();
+
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index ea4061c9b0b..e5d1eacbd14 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -180,7 +180,7 @@ OC.Upload = {
 	},
 
 	init: function() {
-		if ( $('#file_upload_start').exists() && $('#file_upload_start').is(':visible')) {
+		if ( $('#file_upload_start').exists() ) {
 
 			var file_upload_param = {
 				dropZone: $('#content'), // restrict dropZone to content div
@@ -320,6 +320,8 @@ OC.Upload = {
 				 */
 				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);
@@ -481,28 +483,6 @@ OC.Upload = {
 			$('#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){
@@ -615,21 +595,7 @@ OC.Upload = {
 								{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);
+										FileList.add(result.data, {hidden: hidden, insert: true});
 									} else {
 										OC.dialogs.alert(result.data.message, t('core', 'Could not create file'));
 									}
@@ -642,10 +608,7 @@ OC.Upload = {
 								{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);
+										FileList.add(result.data, {hidden: hidden, insert: true});
 									} else {
 										OC.dialogs.alert(result.data.message, t('core', 'Could not create folder'));
 									}
@@ -680,20 +643,10 @@ OC.Upload = {
 								}
 							});
 							eventSource.listen('success',function(data) {
-								var mime = data.mime;
-								var size = data.size;
-								var id = data.id;
+								var file = data;
 								$('#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);
+
+								FileList.add(file, {hidden: hidden, insert: true});
 							});
 							eventSource.listen('error',function(error) {
 								$('#uploadprogressbar').fadeOut();
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 9a69d7b3688..631aebea954 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -8,28 +8,40 @@
  *
  */
 
-/* global OC, FileList	*/
+/* global OC, FileList, Files */
 /* global trashBinApp */
 var FileActions = {
 	actions: {},
 	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
@@ -165,7 +180,7 @@ var FileActions = {
 			}
 			var element = $(html);
 			element.data('action', actions['Delete']);
-			element.on('click', {a: null, elem: parent, actionFunc: actions['Delete']}, actionHandler);
+			element.on('click', {a: null, elem: parent, actionFunc: actions['Delete'].action}, actionHandler);
 			parent.parent().children().last().append(element);
 		}
 
@@ -199,7 +214,7 @@ $(document).ready(function () {
 		FileActions.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
 			return OC.imagePath('core', 'actions/download');
 		}, function (filename) {
-			var url = FileList.getDownloadUrl(filename);
+			var url = Files.getDownloadUrl(filename);
 			if (url) {
 				OC.redirect(url);
 			}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 503bf681139..506741eb6ea 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -8,17 +8,104 @@
  *
  */
 
-/* global OC, t, n, FileList, FileActions, Files */
-/* global procesSelection, dragOptions, SVGSupport, replaceSVG */
-window.FileList={
+/* global OC, t, n, FileList, FileActions, Files, BreadCrumb */
+/* global procesSelection, dragOptions */
+window.FileList = {
 	appName: t('files', 'Files'),
+	isEmpty: true,
 	useUndo:true,
-	postProcessList: function() {
-		$('#fileList tr').each(function() {
-			//little hack to set unescape filenames in attribute
-			$(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
+	$el: $('#filestable'),
+	$fileList: $('#fileList'),
+	breadcrumb: null,
+	initialized: false,
+
+	/**
+	 * Initialize the file list and its components
+	 */
+	initialize: function() {
+		var self = this;
+		if (this.initialized) {
+			return;
+		}
+
+		// TODO: FileList should not know about global elements
+		this.$el = $('#filestable');
+		this.$fileList = $('#fileList');
+
+		this.breadcrumb = new BreadCrumb({
+			onClick: this._onClickBreadCrumb,
+			onDrop: this._onDropOnBreadCrumb,
+			getCrumbUrl: function(part, index) {
+				return self.linkTo(part.dir);
+			}
+		});
+
+		$('#controls').prepend(this.breadcrumb.$el);
+
+		$(window).resize(function() {
+			// TODO: debounce this ?
+			var width = $(this).width();
+			FileList.breadcrumb.resize(width, false);
 		});
 	},
+
+	/**
+	 * Event handler when clicking on a bread crumb
+	 */
+	_onClickBreadCrumb: function(e) {
+		var $el = $(e.target).closest('.crumb'),
+			$targetDir = $el.data('dir');
+
+		if ($targetDir !== undefined) {
+			e.preventDefault();
+			FileList.changeDirectory($targetDir);
+		}
+	},
+
+	/**
+	 * Event handler when dropping on a breadcrumb
+	 */
+	_onDropOnBreadCrumb: function( event, ui ) {
+		var target=$(this).data('dir');
+		var dir = FileList.getCurrentDirectory();
+		while(dir.substr(0,1) === '/') {//remove extra leading /'s
+			dir=dir.substr(1);
+		}
+		dir = '/' + dir;
+		if (dir.substr(-1,1) !== '/') {
+			dir = dir + '/';
+		}
+		if (target === dir || target+'/' === dir) {
+			return;
+		}
+		var files = ui.helper.find('tr');
+		$(files).each(function(i,row) {
+			var dir = $(row).data('dir');
+			var file = $(row).data('filename');
+			//slapdash selector, tracking down our original element that the clone budded off of.
+			var origin = $('tr[data-id=' + $(row).data('origin') + ']');
+			var td = origin.children('td.filename');
+			var oldBackgroundImage = td.css('background-image');
+			td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+			$.post(OC.filePath('files', 'ajax', 'move.php'), { dir: dir, file: file, target: target }, function(result) {
+				if (result) {
+					if (result.status === 'success') {
+						FileList.remove(file);
+						procesSelection();
+						$('#notification').hide();
+					} else {
+						$('#notification').hide();
+						$('#notification').text(result.data.message);
+						$('#notification').fadeIn();
+					}
+				} else {
+					OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
+				}
+				td.css('background-image', oldBackgroundImage);
+			});
+		});
+	},
+
 	/**
 	 * Sets a new page title
 	 */
@@ -36,64 +123,117 @@ window.FileList={
 	},
 	/**
 	 * Returns the tr element for a given file name
+	 * @param fileName file name
 	 */
 	findFileEl: function(fileName){
 		// use filterAttr to avoid escaping issues
-		return $('#fileList tr').filterAttr('data-file', fileName);
+		return this.$fileList.find('tr').filterAttr('data-file', fileName);
 	},
-	update:function(fileListHtml) {
-		var $fileList = $('#fileList');
-		$fileList.empty().html(fileListHtml);
-		FileList.updateEmptyContent();
-		$fileList.find('tr').each(function () {
-			FileActions.display($(this).children('td.filename'));
-		});
-		$fileList.trigger(jQuery.Event("fileActionsReady"));
-		FileList.postProcessList();
+	/**
+	 * Sets the files to be displayed in the list.
+	 * This operation will rerender the list and update the summary.
+	 * @param filesArray array of file data (map)
+	 */
+	setFiles:function(filesArray) {
+		// detach to make adding multiple rows faster
+		this.$fileList.detach();
+
+		this.$fileList.empty();
+
+		this.isEmpty = filesArray.length === 0;
+		for (var i = 0; i < filesArray.length; i++) {
+			this.add(filesArray[i], {updateSummary: false});
+		}
+
+		this.$el.find('thead').after(this.$fileList);
+
+		this.updateEmptyContent();
+		this.$fileList.trigger(jQuery.Event("fileActionsReady"));
 		// "Files" might not be loaded in extending apps
 		if (window.Files) {
 			Files.setupDragAndDrop();
 		}
-		FileList.updateFileSummary();
+		this.updateFileSummary();
 		procesSelection();
-
 		$(window).scrollTop(0);
-		$fileList.trigger(jQuery.Event("updated"));
+
+		this.$fileList.trigger(jQuery.Event("updated"));
 	},
-	createRow:function(type, name, iconurl, linktarget, size, lastModified, permissions) {
-		var td, simpleSize, basename, extension;
+	/**
+	 * Creates a new table row element using the given file data.
+	 * @param fileData map of file attributes
+	 * @param options map of attribute "loading" whether the entry is currently loading
+	 * @return new tr element (not appended to the table)
+	 */
+	_createRow: function(fileData, options) {
+		var td, simpleSize, basename, extension, sizeColor,
+			icon = OC.Util.replaceSVGIcon(fileData.icon),
+			name = fileData.name,
+			type = fileData.type || 'file',
+			mtime = parseInt(fileData.mtime, 10) || new Date().getTime(),
+			mime = fileData.mimetype,
+			linkUrl;
+		options = options || {};
+
+		if (type === 'dir') {
+			mime = mime || 'httpd/unix-directory';
+		}
 		//containing tr
 		var tr = $('<tr></tr>').attr({
+			"data-id" : fileData.id,
 			"data-type": type,
-			"data-size": size,
+			"data-size": fileData.size,
 			"data-file": name,
-			"data-permissions": permissions
+			"data-mime": mime,
+			"data-mtime": mtime,
+			"data-etag": fileData.etag,
+			"data-permissions": fileData.permissions || this.getDirectoryPermissions()
 		});
+
+		if (type === 'dir') {
+			// use default folder icon
+			icon = icon || OC.imagePath('core', 'filetypes/folder');
+		}
+		else {
+			icon = icon || OC.imagePath('core', 'filetypes/file');
+		}
+
 		// filename td
 		td = $('<td></td>').attr({
 			"class": "filename",
-			"style": 'background-image:url('+iconurl+'); background-size: 32px;'
+			"style": 'background-image:url(' + icon + '); background-size: 32px;'
 		});
-		var rand = Math.random().toString(16).slice(2);
-		td.append('<input id="select-'+rand+'" type="checkbox" /><label for="select-'+rand+'"></label>');
+
+		// linkUrl
+		if (type === 'dir') {
+			linkUrl = FileList.linkTo(FileList.getCurrentDirectory() + '/' + name);
+		}
+		else {
+			linkUrl = Files.getDownloadUrl(name, FileList.getCurrentDirectory());
+		}
+		td.append('<input id="select-' + fileData.id + '" type="checkbox" /><label for="select-' + fileData.id + '"></label>');
 		var link_elem = $('<a></a>').attr({
 			"class": "name",
-			"href": linktarget
+			"href": linkUrl
 		});
-		//split extension from filename for non dirs
+
+		// from here work on the display name
+		name = fileData.displayName || name;
+
+		// split extension from filename for non dirs
 		if (type !== 'dir' && name.indexOf('.') !== -1) {
-			basename=name.substr(0,name.lastIndexOf('.'));
-			extension=name.substr(name.lastIndexOf('.'));
+			basename = name.substr(0, name.lastIndexOf('.'));
+			extension = name.substr(name.lastIndexOf('.'));
 		} else {
-			basename=name;
-			extension=false;
+			basename = name;
+			extension = false;
 		}
 		var name_span=$('<span></span>').addClass('nametext').text(basename);
 		link_elem.append(name_span);
 		if (extension) {
 			name_span.append($('<span></span>').addClass('extension').text(extension));
 		}
-		//dirs can show the number of uploaded files
+		// dirs can show the number of uploaded files
 		if (type === 'dir') {
 			link_elem.append($('<span></span>').attr({
 				'class': 'uploadtext',
@@ -103,99 +243,123 @@ window.FileList={
 		td.append(link_elem);
 		tr.append(td);
 
-		//size column
-		if (size !== t('files', 'Pending')) {
-			simpleSize = humanFileSize(size);
+		// size column
+		if (typeof(fileData.size) !== 'undefined' && fileData.size >= 0) {
+			simpleSize = humanFileSize(parseInt(fileData.size, 10));
+			sizeColor = Math.round(160-Math.pow((fileData.size/(1024*1024)),2));
 		} else {
-			simpleSize=t('files', 'Pending');
+			simpleSize = t('files', 'Pending');
 		}
-		var sizeColor = Math.round(160-Math.pow((size/(1024*1024)),2));
-		var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
+		var lastModifiedTime = Math.round(mtime / 1000);
 		td = $('<td></td>').attr({
 			"class": "filesize",
-			"style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'
+			"style": 'color:rgb(' + sizeColor + ',' + sizeColor + ',' + sizeColor + ')'
 		}).text(simpleSize);
 		tr.append(td);
 
 		// date column
-		var modifiedColor = Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*5);
+		var modifiedColor = Math.round((Math.round((new Date()).getTime() / 1000) - mtime)/60/60/24*5);
 		td = $('<td></td>').attr({ "class": "date" });
 		td.append($('<span></span>').attr({
 			"class": "modified",
-			"title": formatDate(lastModified),
+			"title": formatDate(mtime),
 			"style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')'
-		}).text( relative_modified_date(lastModified.getTime() / 1000) ));
+		}).text( relative_modified_date(mtime / 1000) ));
+		tr.find('.filesize').text(simpleSize);
 		tr.append(td);
 		return tr;
 	},
-	addFile:function(name, size, lastModified, loading, hidden, param) {
-		var imgurl;
+	/**
+	 * Adds an entry to the files table using the data from the given file data
+	 * @param fileData map of file attributes
+	 * @param options map of attributes:
+	 * - "insert" true to insert in a sorted manner, false to append (default)
+	 * - "updateSummary" true to update the summary after adding (default), false otherwise
+	 * @return new tr element (not appended to the table)
+	 */
+	add: function(fileData, options) {
+		options = options || {};
+		var type = fileData.type || 'file',
+			mime = fileData.mimetype,
+			permissions = parseInt(fileData.permissions, 10) || 0;
 
-		if (!param) {
-			param = {};
+		if (type === 'dir') {
+			mime = mime || 'httpd/unix-directory';
 		}
+		var tr = this._createRow(
+			fileData,
+			options
+		);
+		var filenameTd = tr.find('td.filename');
 
-		var download_url = null;
-		if (!param.download_url) {
-			download_url = OC.generateUrl(
-				'apps/files/download{file}',
-				{ file: $('#dir').val()+'/'+name });
-		} else {
-			download_url = param.download_url;
+		// sorted insert is expensive, so needs to be explicitly
+		// requested
+		if (options.insert) {
+			this.insertElement(fileData.name, type, tr);
 		}
+		else {
+			this.$fileList.append(tr);
+		}
+		FileList.isEmpty = false;
 
-		if (loading) {
-			imgurl = OC.imagePath('core', 'loading.gif');
-		} else {
-			imgurl = OC.imagePath('core', 'filetypes/file');
-		}
-		var tr = this.createRow(
-			'file',
-			name,
-			imgurl,
-			download_url,
-			size,
-			lastModified,
-			$('#permissions').val()
-		);
+		// TODO: move dragging to FileActions ?
+		// enable drag only for deletable files
+		if (permissions & OC.PERMISSION_DELETE) {
+			filenameTd.draggable(dragOptions);
+		}
+		// allow dropping on folders
+		if (fileData.type === 'dir') {
+			filenameTd.droppable(folderDropOptions);
+		}
 
-		FileList.insertElement(name, 'file', tr);
-		if (loading) {
-			tr.data('loading', true);
-		} else {
-			tr.find('td.filename').draggable(dragOptions);
+		if (options.hidden) {
+			tr.addClass('hidden');
 		}
-		if (hidden) {
-			tr.hide();
+
+		// display actions
+		FileActions.display(filenameTd, false);
+
+		if (fileData.isPreviewAvailable) {
+			// lazy load / newly inserted td ?
+			if (!fileData.icon) {
+				Files.lazyLoadPreview(getPathForPreview(fileData.name), mime, function(url) {
+					filenameTd.css('background-image', 'url(' + url + ')');
+				}, null, null, fileData.etag);
+			}
+			else {
+				// set the preview URL directly
+				var urlSpec = {
+						file: FileList.getCurrentDirectory() + '/' + fileData.name,
+						c: fileData.etag
+					};
+				var previewUrl = Files.generatePreviewUrl(urlSpec);
+				previewUrl = previewUrl.replace('(', '%28').replace(')', '%29');
+				filenameTd.css('background-image', 'url(' + previewUrl + ')');
+			}
 		}
-		return tr;
-	},
-	addDir:function(name, size, lastModified, hidden) {
-
-		var tr = this.createRow(
-			'dir',
-			name,
-			OC.imagePath('core', 'filetypes/folder'),
-			OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/'),
-			size,
-			lastModified,
-			$('#permissions').val()
-		);
 
-		FileList.insertElement(name, 'dir', tr);
-		var td = tr.find('td.filename');
-		td.draggable(dragOptions);
-		td.droppable(folderDropOptions);
-		if (hidden) {
-			tr.hide();
+		// defaults to true if not defined
+		if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
+			this.updateFileSummary();
+			this.updateEmptyContent();
 		}
-		FileActions.display(tr.find('td.filename'), true);
 		return tr;
 	},
+	/**
+	 * Returns the current directory
+	 * @return current directory
+	 */
 	getCurrentDirectory: function(){
 		return $('#dir').val() || '/';
 	},
 	/**
+	 * Returns the directory permissions
+	 * @return permission value as integer
+	 */
+	getDirectoryPermissions: function() {
+		return parseInt($('#permissions').val(), 10);
+	},
+	/**
 	 * @brief Changes the current directory and reload the file list.
 	 * @param targetDir target directory (non URL encoded)
 	 * @param changeUrl false if the URL must not be changed (defaults to true)
@@ -209,7 +373,7 @@ window.FileList={
 		if (!force && currentDir === targetDir) {
 			return;
 		}
-		FileList.setCurrentDir(targetDir, changeUrl);
+		FileList._setCurrentDir(targetDir, changeUrl);
 		$('#fileList').trigger(
 			jQuery.Event('changeDirectory', {
 				dir: targetDir,
@@ -221,7 +385,13 @@ window.FileList={
 	linkTo: function(dir) {
 		return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
 	},
-	setCurrentDir: function(targetDir, changeUrl) {
+
+	/**
+	 * Sets the current directory name and updates the breadcrumb.
+	 * @param targetDir directory to display
+	 * @param changeUrl true to also update the URL, false otherwise (default)
+	 */
+	_setCurrentDir: function(targetDir, changeUrl) {
 		var url,
 			baseDir = OC.basename(targetDir);
 
@@ -243,6 +413,7 @@ window.FileList={
 				window.location.hash = '?dir='+ encodeURIComponent(targetDir).replace(/%2F/g, '/');
 			}
 		}
+		this.breadcrumb.setDirectory(this.getCurrentDirectory());
 	},
 	/**
 	 * @brief Reloads the file list using ajax call
@@ -253,10 +424,9 @@ window.FileList={
 			FileList._reloadCall.abort();
 		}
 		FileList._reloadCall = $.ajax({
-			url: OC.filePath('files','ajax','list.php'),
+			url: Files.getAjaxUrl('list'),
 			data: {
-				dir : $('#dir').val(),
-				breadcrumb: true
+				dir : $('#dir').val()
 			},
 			error: function(result) {
 				FileList.reloadCallback(result);
@@ -269,8 +439,8 @@ window.FileList={
 	reloadCallback: function(result) {
 		var $controls = $('#controls');
 
-		delete FileList._reloadCall;
-		FileList.hideMask();
+		delete this._reloadCall;
+		this.hideMask();
 
 		if (!result || result.status === 'error') {
 			OC.Notification.show(result.data.message);
@@ -279,7 +449,11 @@ window.FileList={
 
 		if (result.status === 404) {
 			// go back home
-			FileList.changeDirectory('/');
+			this.changeDirectory('/');
+			return;
+		}
+		// aborted ?
+		if (result.status === 0){
 			return;
 		}
 
@@ -288,24 +462,10 @@ window.FileList={
 		Files.updateStorageStatistics(true);
 
 		if (result.data.permissions) {
-			FileList.setDirectoryPermissions(result.data.permissions);
+			this.setDirectoryPermissions(result.data.permissions);
 		}
 
-		if (typeof(result.data.breadcrumb) !== 'undefined') {
-			$controls.find('.crumb').remove();
-			$controls.prepend(result.data.breadcrumb);
-
-			var width = $(window).width();
-			Files.initBreadCrumbs();
-			Files.resizeBreadcrumbs(width, true);
-
-			// in case svg is not supported by the browser we need to execute the fallback mechanism
-			if (!SVGSupport()) {
-				replaceSVG();
-			}
-		}
-
-		FileList.update(result.data.files);
+		this.setFiles(result.data.files);
 	},
 	setDirectoryPermissions: function(permissions) {
 		var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
@@ -322,10 +482,14 @@ window.FileList={
 		$('.actions,#file_action_panel').toggleClass('hidden', !show);
 		if (show){
 			// make sure to display according to permissions
-			var permissions =  $('#permissions').val();
+			var permissions = this.getDirectoryPermissions();
 			var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
 			$('.creatable').toggleClass('hidden', !isCreatable);
 			$('.notCreatable').toggleClass('hidden', isCreatable);
+			// remove old style breadcrumbs (some apps might create them)
+			$('#controls .crumb').remove();
+			// refresh breadcrumbs in case it was replaced by an app
+			this.breadcrumb.render();
 		}
 		else{
 			$('.creatable, .notCreatable').addClass('hidden');
@@ -341,22 +505,32 @@ window.FileList={
 		this.showActions(!show);
 		$('#filestable').toggleClass('hidden', show);
 	},
-	remove:function(name){
+	/**
+	 * Removes a file entry from the list
+	 * @param name name of the file to remove
+	 * @param options optional options as map:
+	 * "updateSummary": true to update the summary (default), false otherwise
+	 */
+	remove:function(name, options){
+		options = options || {};
 		var fileEl = FileList.findFileEl(name);
 		if (fileEl.data('permissions') & OC.PERMISSION_DELETE) {
 			// file is only draggable when delete permissions are set
 			fileEl.find('td.filename').draggable('destroy');
 		}
 		fileEl.remove();
-		FileList.updateFileSummary();
-		if ( ! $('tr[data-file]').exists() ) {
-			$('#emptycontent').removeClass('hidden');
-			$('#filescontent th').addClass('hidden');
+		// TODO: improve performance on batch update
+		FileList.isEmpty = !this.$fileList.find('tr:not(.summary)').length;
+		if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
+			FileList.updateEmptyContent();
+			FileList.updateFileSummary();
 		}
+		return fileEl;
 	},
 	insertElement:function(name, type, element) {
-		//find the correct spot to insert the file or folder
-		var pos, fileElements=$('tr[data-file][data-type="'+type+'"]:visible');
+		// find the correct spot to insert the file or folder
+		var pos,
+			fileElements = this.$fileList.find('tr[data-file][data-type="'+type+'"]:not(.hidden)');
 		if (name.localeCompare($(fileElements[0]).attr('data-file')) < 0) {
 			pos = -1;
 		} else if (name.localeCompare($(fileElements[fileElements.length-1]).attr('data-file')) > 0) {
@@ -376,35 +550,18 @@ window.FileList={
 			} else {
 				$(fileElements[pos]).after(element);
 			}
-		} else if (type === 'dir' && $('tr[data-file]').exists()) {
-			$('tr[data-file]').first().before(element);
-		} else if (type === 'file' && $('tr[data-file]').exists()) {
-			$('tr[data-file]').last().before(element);
+		} else if (type === 'dir' && !FileList.isEmpty) {
+			this.$fileList.find('tr[data-file]:first').before(element);
+		} else if (type === 'file' && !FileList.isEmpty) {
+			this.$fileList.find('tr[data-file]:last').before(element);
 		} else {
-			$('#fileList').append(element);
+			this.$fileList.append(element);
 		}
-		$('#emptycontent').addClass('hidden');
-		$('#filestable th').removeClass('hidden');
+		FileList.isEmpty = false;
+		FileList.updateEmptyContent();
 		FileList.updateFileSummary();
 	},
-	loadingDone:function(name, id) {
-		var mime, tr = FileList.findFileEl(name);
-		tr.data('loading', false);
-		mime = tr.data('mime');
-		tr.attr('data-mime', mime);
-		if (id) {
-			tr.attr('data-id', id);
-		}
-		var path = getPathForPreview(name);
-		Files.lazyLoadPreview(path, mime, function(previewpath) {
-			tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
-		}, null, null, tr.attr('data-etag'));
-		tr.find('td.filename').draggable(dragOptions);
-	},
-	isLoading:function(file) {
-		return FileList.findFileEl(file).data('loading');
-	},
-	rename:function(oldname) {
+	rename: function(oldname) {
 		var tr, td, input, form;
 		tr = FileList.findFileEl(oldname);
 		tr.data('renaming',true);
@@ -438,6 +595,7 @@ window.FileList={
 			event.preventDefault();
 			try {
 				var newname = input.val();
+				var directory = FileList.getCurrentDirectory();
 				if (newname !== oldname) {
 					checkInput();
 					// save background image, because it's replaced by a spinner while async request
@@ -480,12 +638,16 @@ window.FileList={
 								tr.attr('data-mime', fileInfo.mime);
 								tr.attr('data-etag', fileInfo.etag);
 								if (fileInfo.isPreviewAvailable) {
-									Files.lazyLoadPreview(fileInfo.directory + '/' + fileInfo.name, result.data.mime, function(previewpath) {
+									Files.lazyLoadPreview(directory + '/' + fileInfo.name, result.data.mime, function(previewpath) {
 										tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
 									}, null, null, result.data.etag);
 								}
 								else {
-									tr.find('td.filename').removeClass('preview').attr('style','background-image:url('+fileInfo.icon+')');
+									tr.find('td.filename')
+										.removeClass('preview')
+										.attr('style','background-image:url('
+												+ OC.Util.replaceSVGIcon(fileInfo.icon)
+												+ ')');
 								}
 							}
 							// reinsert row
@@ -554,58 +716,12 @@ window.FileList={
 	inList:function(file) {
 		return FileList.findFileEl(file).length;
 	},
-	replace:function(oldName, newName, isNewFile) {
-		// Finish any existing actions
-		var oldFileEl = FileList.findFileEl(oldName);
-		var newFileEl = FileList.findFileEl(newName);
-		oldFileEl.hide();
-		newFileEl.hide();
-		var tr = oldFileEl.clone();
-		tr.attr('data-replace', 'true');
-		tr.attr('data-file', newName);
-		var td = tr.children('td.filename');
-		td.children('a.name .span').text(newName);
-		var path = td.children('a.name').attr('href');
-		td.children('a.name').attr('href', path.replace(encodeURIComponent(oldName), encodeURIComponent(newName)));
-		var basename = newName;
-		if (newName.indexOf('.') > 0) {
-			basename = newName.substr(0, newName.lastIndexOf('.'));
-		}
-		td.children('a.name').empty();
-		var span = $('<span class="nametext"></span>');
-		span.text(basename);
-		td.children('a.name').append(span);
-		if (newName.indexOf('.') > 0) {
-			span.append($('<span class="extension">'+newName.substr(newName.lastIndexOf('.'))+'</span>'));
-		}
-		FileList.insertElement(newName, tr.data('type'), tr);
-		tr.show();
-		FileList.replaceCanceled = false;
-		FileList.replaceOldName = oldName;
-		FileList.replaceNewName = newName;
-		FileList.replaceIsNewFile = isNewFile;
-		FileList.lastAction = function() {
-			FileList.finishReplace();
-		};
-		if (!isNewFile) {
-			OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
-		}
-	},
-	finishReplace:function() {
-		if (!FileList.replaceCanceled && FileList.replaceOldName && FileList.replaceNewName) {
-			$.ajax({url: OC.filePath('files', 'ajax', 'rename.php'), async: false, data: { dir: $('#dir').val(), newname: FileList.replaceNewName, file: FileList.replaceOldName }, success: function(result) {
-				if (result && result.status === 'success') {
-					$('tr[data-replace="true"').removeAttr('data-replace');
-				} else {
-					OC.dialogs.alert(result.data.message, 'Error moving file');
-				}
-				FileList.replaceCanceled = true;
-				FileList.replaceOldName = null;
-				FileList.replaceNewName = null;
-				FileList.lastAction = null;
-			}});
-		}
-	},
+	/**
+	 * Delete the given files from the given dir
+	 * @param files file names list (without path)
+	 * @param dir directory in which to delete the files, defaults to the current
+	 * directory
+	 */
 	do_delete:function(files, dir) {
 		var params;
 		if (files && files.substr) {
@@ -622,7 +738,7 @@ window.FileList={
 			FileList.lastAction();
 		}
 
-		var params = {
+		params = {
 			dir: dir || FileList.getCurrentDirectory()
 		};
 		if (files) {
@@ -643,10 +759,9 @@ window.FileList={
 						}
 						else {
 							$.each(files,function(index,file) {
-								var files = FileList.findFileEl(file);
-								files.remove();
-								files.find('input[type="checkbox"]').removeAttr('checked');
-								files.removeClass('selected');
+								var fileEl = FileList.remove(file, {updateSummary: false});
+								fileEl.find('input[type="checkbox"]').prop('checked', false);
+								fileEl.removeClass('selected');
 							});
 						}
 						procesSelection();
@@ -680,7 +795,7 @@ window.FileList={
 				});
 	},
 	createFileSummary: function() {
-		if( $('#fileList tr').exists() ) {
+		if ( !FileList.isEmpty ) {
 			var summary = this._calculateFileSummary();
 
 			// Get translations
@@ -702,7 +817,7 @@ window.FileList={
 			}
 
 			var $summary = $('<tr class="summary" data-file="undefined"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
-			$('#fileList').append($summary);
+			this.$fileList.append($summary);
 
 			var $dirInfo = $summary.find('.dirinfo');
 			var $fileInfo = $summary.find('.fileinfo');
@@ -710,12 +825,12 @@ window.FileList={
 
 			// Show only what's necessary, e.g.: no files: don't show "0 files"
 			if (summary.totalDirs === 0) {
-				$dirInfo.hide();
-				$connector.hide();
+				$dirInfo.addClass('hidden');
+				$connector.addClass('hidden');
 			}
 			if (summary.totalFiles === 0) {
-				$fileInfo.hide();
-				$connector.hide();
+				$fileInfo.addClass('hidden');
+				$connector.addClass('hidden');
 			}
 		}
 	},
@@ -740,10 +855,13 @@ window.FileList={
 		return result;
 	},
 	updateFileSummary: function() {
-		var $summary = $('.summary');
+		var $summary = this.$el.find('.summary');
+
+		// always make it the last element
+		this.$fileList.append($summary.detach());
 
 		// Check if we should remove the summary to show "Upload something"
-		if ($('#fileList tr').length === 1 && $summary.length === 1) {
+		if (this.isEmpty && $summary.length === 1) {
 			$summary.remove();
 		}
 		// If there's no summary create one (createFileSummary checks if there's data)
@@ -751,7 +869,7 @@ window.FileList={
 			FileList.createFileSummary();
 		}
 		// There's a summary and data -> Update the summary
-		else if ($('#fileList tr').length > 1 && $summary.length === 1) {
+		else if (!this.isEmpty && $summary.length === 1) {
 			var fileSummary = this._calculateFileSummary();
 			var $dirInfo = $('.summary .dirinfo');
 			var $fileInfo = $('.summary .fileinfo');
@@ -764,19 +882,19 @@ window.FileList={
 
 			// Show only what's necessary (may be hidden)
 			if (fileSummary.totalDirs === 0) {
-				$dirInfo.hide();
-				$connector.hide();
+				$dirInfo.addClass('hidden');
+				$connector.addClass('hidden');
 			} else {
-				$dirInfo.show();
+				$dirInfo.removeClass('hidden');
 			}
 			if (fileSummary.totalFiles === 0) {
-				$fileInfo.hide();
-				$connector.hide();
+				$fileInfo.addClass('hidden');
+				$connector.addClass('hidden');
 			} else {
-				$fileInfo.show();
+				$fileInfo.removeClass('hidden');
 			}
 			if (fileSummary.totalDirs > 0 && fileSummary.totalFiles > 0) {
-				$connector.show();
+				$connector.removeClass('hidden');
 			}
 		}
 	},
@@ -784,10 +902,14 @@ window.FileList={
 		var $fileList = $('#fileList');
 		var permissions = $('#permissions').val();
 		var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
-		var exists = $fileList.find('tr:first').exists();
-		$('#emptycontent').toggleClass('hidden', !isCreatable || exists);
-		$('#filestable th').toggleClass('hidden', !exists);
+		$('#emptycontent').toggleClass('hidden', !isCreatable || !FileList.isEmpty);
+		$('#filestable thead th').toggleClass('hidden', FileList.isEmpty);
 	},
+	/**
+	 * Shows the loading mask.
+	 *
+	 * @see #hideMask
+	 */
 	showMask: function() {
 		// in case one was shown before
 		var $mask = $('#content .mask');
@@ -795,23 +917,23 @@ window.FileList={
 			return;
 		}
 
+		this.$el.addClass('hidden');
+
 		$mask = $('<div class="mask transparent"></div>');
 
 		$mask.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
 		$mask.css('background-repeat', 'no-repeat');
 		$('#content').append($mask);
 
-		// block UI, but only make visible in case loading takes longer
-		FileList._maskTimeout = window.setTimeout(function() {
-			// reset opacity
-			$mask.removeClass('transparent');
-		}, 250);
+		$mask.removeClass('transparent');
 	},
+	/**
+	 * Hide the loading mask.
+	 * @see #showMask
+	 */
 	hideMask: function() {
-		var $mask = $('#content .mask').remove();
-		if (FileList._maskTimeout) {
-			window.clearTimeout(FileList._maskTimeout);
-		}
+		$('#content .mask').remove();
+		this.$el.removeClass('hidden');
 	},
 	scrollTo:function(file) {
 		//scroll to and highlight preselected file
@@ -850,29 +972,11 @@ window.FileList={
 	 */
 	isAllSelected: function() {
 		return $('#select_all').prop('checked');
-	},
-
-	/**
-	 * Returns the download URL of the given file
-	 * @param filename file name of the file
-	 * @param dir optional directory in which the file name is, defaults to the current directory
-	 */
-	getDownloadUrl: function(filename, dir) {
-		var files = filename;
-		if ($.isArray(filename)) {
-			files = JSON.stringify(filename);
-		}
-		var params = {
-			dir: dir || FileList.getCurrentDirectory(),
-			files: files
-		};
-		return OC.filePath('files', 'ajax', 'download.php') + '?' + OC.buildQueryString(params);
 	}
 };
 
 $(document).ready(function() {
-	var baseDir,
-		isPublic = !!$('#isPublic').val();
+	FileList.initialize();
 
 	// handle upload events
 	var file_upload_start = $('#file_upload_start');
@@ -907,8 +1011,13 @@ $(document).ready(function() {
 					{name: 'requesttoken', value: oc_requesttoken}
 				];
 			};
+		} else {
+			// cancel uploads to current dir if no permission
+			var isCreatable = (FileList.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
+			if (!isCreatable) {
+				return false;
+			}
 		}
-
 	});
 	file_upload_start.on('fileuploadadd', function(e, data) {
 		OC.Upload.log('filelist handle fileuploadadd', e, data);
@@ -993,31 +1102,11 @@ $(document).ready(function() {
 				if (data.files[0].size>=0) {
 					size=data.files[0].size;
 				}
-				var date=new Date();
-				var param = {};
-				if ($('#publicUploadRequestToken').exists()) {
-					param.download_url = document.location.href + '&download&path=/' + $('#dir').val() + '/' + file.name;
-				}
 				//should the file exist in the list remove it
 				FileList.remove(file.name);
 
 				// create new file context
-				data.context = FileList.addFile(file.name, file.size, date, false, false, param);
-
-				// update file data
-				data.context.attr('data-mime',file.mime).attr('data-id',file.id).attr('data-etag', file.etag);
-
-				var permissions = data.context.data('permissions');
-				if (permissions !== file.permissions) {
-					data.context.attr('data-permissions', file.permissions);
-					data.context.data('permissions', file.permissions);
-				}
-				FileActions.display(data.context.find('td.filename'), true);
-
-				var path = getPathForPreview(file.name);
-				Files.lazyLoadPreview(path, file.mime, function(previewpath) {
-					data.context.find('td.filename').attr('style','background-image:url('+previewpath+')');
-				}, null, null, file.etag);
+				data.context = FileList.add(file, {insert: true});
 			}
 		}
 	});
@@ -1049,31 +1138,6 @@ $(document).ready(function() {
 	});
 
 	$('#notification').hide();
-	$('#notification').on('click', '.undo', function() {
-		if (FileList.deleteFiles) {
-			$.each(FileList.deleteFiles,function(index,file) {
-				FileList.findFileEl(file).show();
-			});
-			FileList.deleteCanceled=true;
-			FileList.deleteFiles=null;
-		} else if (FileList.replaceOldName && FileList.replaceNewName) {
-			if (FileList.replaceIsNewFile) {
-				// Delete the new uploaded file
-				FileList.deleteCanceled = false;
-				FileList.deleteFiles = [FileList.replaceOldName];
-			} else {
-				FileList.findFileEl(FileList.replaceOldName).show();
-			}
-			$('tr[data-replace="true"').remove();
-			FileList.findFileEl(FileList.replaceNewName).show();
-			FileList.replaceCanceled = true;
-			FileList.replaceOldName = null;
-			FileList.replaceNewName = null;
-			FileList.replaceIsNewFile = null;
-		}
-		FileList.lastAction = null;
-		OC.Notification.hide();
-	});
 	$('#notification:first-child').on('click', '.replace', function() {
 		OC.Notification.hide(function() {
 			FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile'));
@@ -1081,7 +1145,7 @@ $(document).ready(function() {
 	});
 	$('#notification:first-child').on('click', '.suggest', function() {
 		var file = $('#notification > span').attr('data-oldName');
-		FileList.findFileEl(file).show();
+		FileList.findFileEl(file).removeClass('hidden');
 		OC.Notification.hide();
 	});
 	$('#notification:first-child').on('click', '.cancel', function() {
@@ -1130,34 +1194,32 @@ $(document).ready(function() {
 	}
 
 	// disable ajax/history API for public app (TODO: until it gets ported)
-	if (!isPublic) {
-		// fallback to hashchange when no history support
-		if (!window.history.pushState) {
-			$(window).on('hashchange', function() {
-				FileList.changeDirectory(parseCurrentDirFromUrl(), false);
-			});
+	// fallback to hashchange when no history support
+	if (!window.history.pushState) {
+		$(window).on('hashchange', function() {
+			FileList.changeDirectory(parseCurrentDirFromUrl(), false);
+		});
+	}
+	window.onpopstate = function(e) {
+		var targetDir;
+		if (e.state && e.state.dir) {
+			targetDir = e.state.dir;
 		}
-		window.onpopstate = function(e) {
-			var targetDir;
-			if (e.state && e.state.dir) {
-				targetDir = e.state.dir;
-			}
-			else{
-				// read from URL
-				targetDir = parseCurrentDirFromUrl();
-			}
-			if (targetDir) {
-				FileList.changeDirectory(targetDir, false);
-			}
-		};
-
-		if (parseInt($('#ajaxLoad').val(), 10) === 1) {
-			// need to initially switch the dir to the one from the hash (IE8)
-			FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
+		else{
+			// read from URL
+			targetDir = parseCurrentDirFromUrl();
+		}
+		if (targetDir) {
+			FileList.changeDirectory(targetDir, false);
 		}
+	};
 
-		FileList.setCurrentDir(parseCurrentDirFromUrl(), false);
-	}
+	var dir = parseCurrentDirFromUrl();
+	// trigger ajax load, deferred to let sub-apps do their overrides first
+	setTimeout(function() {
+		FileList.changeDirectory(dir, false, true);
+	}, 0);
 
 	FileList.createFileSummary();
 });
+
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 1186a72a44f..ac10191618b 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -131,15 +131,15 @@ var Files = {
 		var encryptedFiles = $('#encryptedFiles').val();
 		var initStatus = $('#encryptionInitStatus').val();
 		if (initStatus === '0') { // enc not initialized, but should be
-			OC.Notification.show(t('files_encryption', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'));
+			OC.Notification.show(t('files', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'));
 			return;
 		}
 		if (initStatus === '1') { // encryption tried to init but failed
-			OC.Notification.showHtml(t('files_encryption', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
+			OC.Notification.showHtml(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
 			return;
 		}
 		if (encryptedFiles === '1') {
-			OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
+			OC.Notification.show(t('files', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
 			return;
 		}
 	},
@@ -161,77 +161,33 @@ var Files = {
 		});
 	},
 
-	lastWidth: 0,
-
-	initBreadCrumbs: function () {
-		var $controls = $('#controls');
-
-		Files.lastWidth = 0;
-		Files.breadcrumbs = [];
-
-		// initialize with some extra space
-		Files.breadcrumbsWidth = 64;
-		if ( document.getElementById("navigation") ) {
-			Files.breadcrumbsWidth += $('#navigation').get(0).offsetWidth;
+	/**
+	 * Returns the download URL of the given file(s)
+	 * @param filename string or array of file names to download
+	 * @param dir optional directory in which the file name is, defaults to the current directory
+	 */
+	getDownloadUrl: function(filename, dir) {
+		if ($.isArray(filename)) {
+			filename = JSON.stringify(filename);
 		}
-		Files.hiddenBreadcrumbs = 0;
-
-		$.each($('.crumb'), function(index, breadcrumb) {
-			Files.breadcrumbs[index] = breadcrumb;
-			Files.breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
-		});
-
-		$.each($('#controls .actions>div'), function(index, action) {
-			Files.breadcrumbsWidth += $(action).get(0).offsetWidth;
-		});
-
-		// event handlers for breadcrumb items
-		$controls.find('.crumb a').on('click', onClickBreadcrumb);
-
-		// setup drag and drop
-		$controls.find('.crumb:not(.last)').droppable(crumbDropOptions);
+		var params = {
+			dir: dir || FileList.getCurrentDirectory(),
+			files: filename
+		};
+		return this.getAjaxUrl('download', params);
 	},
 
-	resizeBreadcrumbs: function (width, firstRun) {
-		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;
-				}
-				var i = Files.hiddenBreadcrumbs;
-				while (width < Files.breadcrumbsWidth && i > 1 && i < Files.breadcrumbs.length - 1) {
-					Files.breadcrumbsWidth -= $(Files.breadcrumbs[i]).get(0).offsetWidth;
-					$(Files.breadcrumbs[i]).hide();
-					Files.hiddenBreadcrumbs = i;
-					i++;
-				}
-			} else if (width > Files.lastWidth && Files.hiddenBreadcrumbs > 0) {
-				var i = Files.hiddenBreadcrumbs;
-				while (width > Files.breadcrumbsWidth && i > 0) {
-					if (Files.hiddenBreadcrumbs === 1) {
-						Files.breadcrumbsWidth -= $(Files.breadcrumbs[1]).get(0).offsetWidth;
-						$(Files.breadcrumbs[1]).find('span').remove();
-						$(Files.breadcrumbs[1]).find('a').show();
-						Files.breadcrumbsWidth += $(Files.breadcrumbs[1]).get(0).offsetWidth;
-					} else {
-						$(Files.breadcrumbs[i]).show();
-						Files.breadcrumbsWidth += $(Files.breadcrumbs[i]).get(0).offsetWidth;
-						if (Files.breadcrumbsWidth > width) {
-							Files.breadcrumbsWidth -= $(Files.breadcrumbs[i]).get(0).offsetWidth;
-							$(Files.breadcrumbs[i]).hide();
-							break;
-						}
-					}
-					i--;
-					Files.hiddenBreadcrumbs = i;
-				}
-			}
-			Files.lastWidth = width;
+	/**
+	 * Returns the ajax URL for a given action
+	 * @param action action string
+	 * @param params optional params map
+	 */
+	getAjaxUrl: function(action, params) {
+		var q = '';
+		if (params) {
+			q = '?' + OC.buildQueryString(params);
 		}
+		return OC.filePath('files', 'ajax', action + '.php') + q;
 	}
 };
 $(document).ready(function() {
@@ -242,14 +198,10 @@ $(document).ready(function() {
 	Files.displayEncryptionWarning();
 	Files.bindKeyboardShortcuts(document, jQuery);
 
-	FileList.postProcessList();
 	Files.setupDragAndDrop();
 
 	$('#file_action_panel').attr('activeAction', false);
 
-	// allow dropping on the "files" app icon
-	$('ul#apps li:first-child').data('dir','').droppable(crumbDropOptions);
-
 	// Triggers invisible file input
 	$('#upload a').on('click', function() {
 		$(this).parent().children('#file_upload_start').trigger('click');
@@ -308,7 +260,7 @@ $(document).ready(function() {
 			var filename=$(this).parent().parent().attr('data-file');
 			var tr = FileList.findFileEl(filename);
 			var renaming=tr.data('renaming');
-			if (!renaming && !FileList.isLoading(filename)) {
+			if (!renaming) {
 				FileActions.currentFile = $(this).parent();
 				var mime=FileActions.getCurrentMimeType();
 				var type=FileActions.getCurrentType();
@@ -374,15 +326,15 @@ $(document).ready(function() {
 			dir = OC.dirname(dir) || '/';
 		}
 		else {
-			files = getSelectedFilesTrash('name');
+			files = Files.getSelectedFiles('name');
 		}
 		OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
-		OC.redirect(FileList.getDownloadUrl(files, dir));
+		OC.redirect(Files.getDownloadUrl(files, dir));
 		return false;
 	});
 
 	$('.delete-selected').click(function(event) {
-		var files=getSelectedFilesTrash('name');
+		var files = Files.getSelectedFiles('name');
 		event.preventDefault();
 		if (FileList.isAllSelected()) {
 			files = null;
@@ -400,16 +352,6 @@ $(document).ready(function() {
 	//do a background scan if needed
 	scanFiles();
 
-	Files.initBreadCrumbs();
-
-	$(window).resize(function() {
-		var width = $(this).width();
-		Files.resizeBreadcrumbs(width, false);
-	});
-
-	var width = $(this).width();
-	Files.resizeBreadcrumbs(width, true);
-
 	// display storage warnings
 	setTimeout(Files.displayStorageWarnings, 100);
 	OC.Notification.setDefault(Files.displayStorageWarnings);
@@ -500,7 +442,7 @@ var createDragShadow = function(event) {
 		$(event.target).parents('tr').find('td input:first').prop('checked',true);
 	}
 
-	var selectedFiles = getSelectedFilesTrash();
+	var selectedFiles = Files.getSelectedFiles();
 
 	if (!isDragSelected && selectedFiles.length === 1) {
 		//revert the selection
@@ -616,52 +558,8 @@ var folderDropOptions={
 	tolerance: 'pointer'
 };
 
-var crumbDropOptions={
-	drop: function( event, ui ) {
-		var target=$(this).data('dir');
-		var dir = $('#dir').val();
-		while(dir.substr(0,1) === '/') {//remove extra leading /'s
-				dir=dir.substr(1);
-		}
-		dir = '/' + dir;
-		if (dir.substr(-1,1) !== '/') {
-			dir = dir + '/';
-		}
-		if (target === dir || target+'/' === dir) {
-			return;
-		}
-		var files = ui.helper.find('tr');
-		$(files).each(function(i,row) {
-			var dir = $(row).data('dir');
-			var file = $(row).data('filename');
-			//slapdash selector, tracking down our original element that the clone budded off of.
-			var origin = $('tr[data-id=' + $(row).data('origin') + ']');
-			var td = origin.children('td.filename');
-			var oldBackgroundImage = td.css('background-image');
-			td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
-			$.post(OC.filePath('files', 'ajax', 'move.php'), { dir: dir, file: file, target: target }, function(result) {
-				if (result) {
-					if (result.status === 'success') {
-						FileList.remove(file);
-						procesSelection();
-						$('#notification').hide();
-					} else {
-						$('#notification').hide();
-						$('#notification').text(result.data.message);
-						$('#notification').fadeIn();
-					}
-				} else {
-					OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
-				}
-				td.css('background-image', oldBackgroundImage);
-			});
-		});
-	},
-	tolerance: 'pointer'
-};
-
 function procesSelection() {
-	var selected = getSelectedFilesTrash();
+	var selected = Files.getSelectedFiles();
 	var selectedFiles = selected.filter(function(el) {
 		return el.type==='file';
 	});
@@ -711,7 +609,7 @@ function procesSelection() {
  * if property is set, an array with that property for each file is returnd
  * if it's ommited an array of objects with all properties is returned
  */
-function getSelectedFilesTrash(property) {
+Files.getSelectedFiles = function(property) {
 	var elements=$('td.filename input:checkbox:checked').parent().parent();
 	var files=[];
 	elements.each(function(i,element) {
@@ -737,7 +635,7 @@ Files.getMimeIcon = function(mime, ready) {
 		ready(Files.getMimeIcon.cache[mime]);
 	} else {
 		$.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path) {
-			if(SVGSupport()){
+			if(OC.Util.hasSVGSupport()){
 				path = path.substr(0, path.length-4) + '.svg';
 			}
 			Files.getMimeIcon.cache[mime]=path;
@@ -752,25 +650,32 @@ function getPathForPreview(name) {
 	return path;
 }
 
+/**
+ * Generates a preview URL based on the URL space.
+ * @param urlSpec map with {x: width, y: height, file: file path}
+ * @return preview URL
+ */
+Files.generatePreviewUrl = function(urlSpec) {
+	urlSpec = urlSpec || {};
+	if (!urlSpec.x) {
+		urlSpec.x = $('#filestable').data('preview-x');
+	}
+	if (!urlSpec.y) {
+		urlSpec.y = $('#filestable').data('preview-y');
+	}
+	urlSpec.y *= window.devicePixelRatio;
+	urlSpec.x *= window.devicePixelRatio;
+	urlSpec.forceIcon = 0;
+	return OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
+}
+
 Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
 	// get mime icon url
 	Files.getMimeIcon(mime, function(iconURL) {
-		var urlSpec = {};
-		var previewURL;
+		var previewURL,
+			urlSpec = {};
 		ready(iconURL); // set mimeicon URL
 
-		// now try getting a preview thumbnail URL
-		if ( ! width ) {
-			width = $('#filestable').data('preview-x');
-		}
-		if ( ! height ) {
-			height = $('#filestable').data('preview-y');
-		}
-		// note: the order of arguments must match the one
-		// from the server's template so that the browser
-		// knows it's the same file for caching
-		urlSpec.x = width;
-		urlSpec.y = height;
 		urlSpec.file = Files.fixPath(path);
 
 		if (etag){
@@ -781,15 +686,9 @@ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
 			console.warn('Files.lazyLoadPreview(): missing etag argument');
 		}
 
-		if ( $('#isPublic').length ) {
-			urlSpec.t = $('#dirToken').val();
-			previewURL = OC.generateUrl('/publicpreview.png?') + $.param(urlSpec);
-		} else {
-			previewURL = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
-		}
+		previewURL = Files.generatePreviewUrl(urlSpec);
 		previewURL = previewURL.replace('(', '%28');
 		previewURL = previewURL.replace(')', '%29');
-		previewURL += '&forceIcon=0';
 
 		// preload image to prevent delay
 		// this will make the browser cache the image
@@ -799,7 +698,7 @@ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
 			if (img.width > 5) {
 				ready(previewURL);
 			}
-		}
+		};
 		img.src = previewURL;
 	});
 };
@@ -838,14 +737,8 @@ function checkTrashStatus() {
 	});
 }
 
-function onClickBreadcrumb(e) {
-	var $el = $(e.target).closest('.crumb'),
-		$targetDir = $el.data('dir'),
-		isPublic = !!$('#isPublic').val();
-
-	if ($targetDir !== undefined && !isPublic) {
-		e.preventDefault();
-		FileList.changeDirectory(decodeURIComponent($targetDir));
-	}
+// override core's fileDownloadPath (legacy)
+function fileDownloadPath(dir, file) {
+	return Files.getDownloadUrl(file, dir);
 }
 
diff --git a/apps/files/l10n/am_ET.php b/apps/files/l10n/am_ET.php
new file mode 100644
index 00000000000..0157af093e9
--- /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 10f2b077fee..e7c081b1c47 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -27,9 +27,9 @@ $TRANSLATIONS = array(
 "Share" => "شارك",
 "Delete permanently" => "حذف بشكل دائم",
 "Rename" => "إعادة تسميه",
+"Error moving file" => "حدث خطأ أثناء نقل الملف",
+"Error" => "خطأ",
 "Pending" => "قيد الانتظار",
-"replaced {new_name} with {old_name}" => "استبدل {new_name}  بـ  {old_name}",
-"undo" => "تراجع",
 "_%n folder_::_%n folders_" => array("لا يوجد مجلدات %n","1 مجلد %n","2 مجلد %n","عدد قليل من مجلدات %n","عدد كبير من مجلدات %n","مجلدات %n"),
 "_%n file_::_%n files_" => array("لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"),
 "{dirs} and {files}" => "{dirs} و {files}",
@@ -40,8 +40,6 @@ $TRANSLATIONS = array(
 "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" => "معدل",
@@ -68,7 +66,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/ast.php b/apps/files/l10n/ast.php
new file mode 100644
index 00000000000..93ae47b25c5
--- /dev/null
+++ b/apps/files/l10n/ast.php
@@ -0,0 +1,29 @@
+<?php
+$TRANSLATIONS = array(
+"File name cannot be empty." => "El nome de ficheru nun pue quedar baleru.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos.",
+"No file was uploaded. Unknown error" => "Nun se xubió dengún ficheru. Fallu desconocíu",
+"There is no error, the file uploaded with success" => "Nun hai dengún fallu, el ficheru xubióse ensin problemes",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El ficheru xubíu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML",
+"The uploaded file was only partially uploaded" => "El ficheru xubióse de mou parcial",
+"No file was uploaded" => "Nun se xubió dengún ficheru",
+"Missing a temporary folder" => "Falta una carpeta temporal",
+"Failed to write to disk" => "Fallu al escribir al discu",
+"Not enough storage available" => "Nun hai abondu espaciu disponible",
+"Files" => "Ficheros",
+"Share" => "Compartir",
+"Rename" => "Renomar",
+"Error" => "Fallu",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Name" => "Nome",
+"Size" => "Tamañu",
+"Upload" => "Xubir",
+"Save" => "Guardar",
+"New folder" => "Nueva carpeta",
+"Cancel upload" => "Encaboxar xuba",
+"Download" => "Descargar",
+"Delete" => "Desaniciar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/az.php b/apps/files/l10n/az.php
index 70ab6572ba4..0157af093e9 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/be.php b/apps/files/l10n/be.php
index 830400b93fb..f97fc27e2d1 100644
--- a/apps/files/l10n/be.php
+++ b/apps/files/l10n/be.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Error" => "Памылка",
 "_%n folder_::_%n folders_" => array("","","",""),
 "_%n file_::_%n files_" => array("","","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
-"Error" => "Памылка"
+"_Uploading %n file_::_Uploading %n files_" => array("","","","")
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 12e699064be..2418010cdd9 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -12,12 +12,11 @@ $TRANSLATIONS = array(
 "Share" => "Споделяне",
 "Delete permanently" => "Изтриване завинаги",
 "Rename" => "Преименуване",
+"Error" => "Грешка",
 "Pending" => "Чакащо",
-"undo" => "възтановяване",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "Грешка",
 "Name" => "Име",
 "Size" => "Размер",
 "Modified" => "Променено",
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 11f3525690b..667a68bb627 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -19,13 +19,11 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} টি বিদ্যমান",
 "Share" => "ভাগাভাগি কর",
 "Rename" => "পূনঃনামকরণ",
+"Error" => "সমস্যা",
 "Pending" => "মুলতুবি",
-"replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে",
-"undo" => "ক্রিয়া প্রত্যাহার",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "সমস্যা",
 "Name" => "রাম",
 "Size" => "আকার",
 "Modified" => "পরিবর্তিত",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index e1c7decdbbd..8ef9b764484 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Comparteix",
 "Delete permanently" => "Esborra permanentment",
 "Rename" => "Reanomena",
+"Error moving file" => "Error en moure el fitxer",
+"Error" => "Error",
 "Pending" => "Pendent",
 "Could not rename file" => "No es pot canviar el nom de fitxer",
-"replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
-"undo" => "desfés",
 "Error deleting file." => "Error en esborrar el fitxer.",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
 "_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
 "Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.",
-"Error moving file" => "Error en moure el fitxer",
-"Error" => "Error",
 "Name" => "Nom",
 "Size" => "Mida",
 "Modified" => "Modificat",
@@ -90,7 +88,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 3fac6f15c08..8aea17a7051 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Sdílet",
 "Delete permanently" => "Trvale odstranit",
 "Rename" => "Přejmenovat",
+"Error moving file" => "Chyba při přesunu souboru",
+"Error" => "Chyba",
 "Pending" => "Nevyřízené",
 "Could not rename file" => "Nepodařilo se přejmenovat soubor",
-"replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
-"undo" => "vrátit zpět",
 "Error deleting file." => "Chyba při mazání souboru.",
 "_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
 "_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Š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.",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
-"Error moving file" => "Chyba při přesunu souboru",
-"Error" => "Chyba",
 "Name" => "Název",
 "Size" => "Velikost",
 "Modified" => "Upraveno",
@@ -90,7 +88,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 cf3187e4d16..b27e4c3bfc2 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -21,16 +21,14 @@ $TRANSLATIONS = array(
 "Share" => "Rhannu",
 "Delete permanently" => "Dileu'n barhaol",
 "Rename" => "Ailenwi",
+"Error" => "Gwall",
 "Pending" => "I ddod",
-"replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}",
-"undo" => "dadwneud",
 "_%n folder_::_%n folders_" => array("","","",""),
 "_%n file_::_%n files_" => array("","","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","","",""),
 "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.",
-"Error" => "Gwall",
 "Name" => "Enw",
 "Size" => "Maint",
 "Modified" => "Addaswyd",
@@ -55,7 +53,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 ae2a15ed6b8..6a7ea4745cc 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -3,7 +3,9 @@ $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.",
+"\"%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",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "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.",
+"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.",
@@ -39,23 +43,22 @@ $TRANSLATIONS = array(
 "Share" => "Del",
 "Delete permanently" => "Slet permanent",
 "Rename" => "Omdøb",
+"Error moving file" => "Fejl ved flytning af fil",
+"Error" => "Fejl",
 "Pending" => "Afventer",
 "Could not rename file" => "Kunne ikke omdøbe filen",
-"replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
-"undo" => "fortryd",
 "Error deleting file." => "Fejl ved sletnign af 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("Uploader %n fil","Uploader %n filer"),
+"\"{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.",
 "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ø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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
 "Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.",
-"Error moving file" => "Fejl ved flytning af fil",
-"Error" => "Fejl",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Ændret",
@@ -85,7 +88,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 91e5cfa4c91..401ee243f28 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Teilen",
 "Delete permanently" => "Endgültig löschen",
 "Rename" => "Umbenennen",
+"Error moving file" => "Fehler beim Verschieben der Datei",
+"Error" => "Fehler",
 "Pending" => "Ausstehend",
 "Could not rename file" => "Die Datei konnte nicht umbenannt werden",
-"replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
-"undo" => "rückgängig machen",
 "Error deleting file." => "Fehler beim Löschen der Datei.",
 "_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
 "_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "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 Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln.",
 "Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
-"Error moving file" => "Fehler beim Verschieben der Datei",
-"Error" => "Fehler",
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
@@ -90,7 +88,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_CH.php b/apps/files/l10n/de_CH.php
index 9b69a3f7286..f797be99e98 100644
--- a/apps/files/l10n/de_CH.php
+++ b/apps/files/l10n/de_CH.php
@@ -23,9 +23,8 @@ $TRANSLATIONS = array(
 "Share" => "Teilen",
 "Delete permanently" => "Endgültig löschen",
 "Rename" => "Umbenennen",
+"Error" => "Fehler",
 "Pending" => "Ausstehend",
-"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
-"undo" => "rückgängig machen",
 "_%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"),
@@ -33,7 +32,6 @@ $TRANSLATIONS = array(
 "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern.",
-"Error" => "Fehler",
 "Name" => "Name",
 "Size" => "Grösse",
 "Modified" => "Geändert",
@@ -60,7 +58,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 9bb9fe17546..4768faa97da 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Teilen",
 "Delete permanently" => "Endgültig löschen",
 "Rename" => "Umbenennen",
+"Error moving file" => "Fehler beim Verschieben der Datei",
+"Error" => "Fehler",
 "Pending" => "Ausstehend",
 "Could not rename file" => "Die Datei konnte nicht umbenannt werden",
-"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
-"undo" => "rückgängig machen",
 "Error deleting file." => "Fehler beim Löschen der Datei.",
 "_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
 "_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
-"Error moving file" => "Fehler beim Verschieben der Datei",
-"Error" => "Fehler",
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
@@ -90,7 +88,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 4e207f80ee7..713072d3e0e 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "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, παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή",
@@ -28,6 +29,8 @@ $TRANSLATIONS = array(
 "Invalid directory." => "Μη έγκυρος φάκελος.",
 "Files" => "Αρχεία",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes",
+"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." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
@@ -40,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Διαμοιρασμός",
 "Delete permanently" => "Μόνιμη διαγραφή",
 "Rename" => "Μετονομασία",
+"Error moving file" => "Σφάλμα κατά τη μετακίνηση του αρχείου",
+"Error" => "Σφάλμα",
 "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 file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
@@ -56,8 +59,6 @@ $TRANSLATIONS = array(
 "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" => "Τροποποιήθηκε",
@@ -87,7 +88,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 22876ae4f2a..705f6b99b0b 100644
--- a/apps/files/l10n/en_GB.php
+++ b/apps/files/l10n/en_GB.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Share",
 "Delete permanently" => "Delete permanently",
 "Rename" => "Rename",
+"Error moving file" => "Error moving file",
+"Error" => "Error",
 "Pending" => "Pending",
 "Could not rename file" => "Could not rename file",
-"replaced {new_name} with {old_name}" => "replaced {new_name} with {old_name}",
-"undo" => "undo",
 "Error deleting file." => "Error deleting file.",
 "_%n folder_::_%n folders_" => array("%n folder","%n folders"),
 "_%n file_::_%n files_" => array("%n file","%n files"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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." => "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." => "Your download is being prepared. This might take some time if the files are big.",
-"Error moving file" => "Error moving file",
-"Error" => "Error",
 "Name" => "Name",
 "Size" => "Size",
 "Modified" => "Modified",
@@ -90,7 +88,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 b447b95b4e5..a6e0d553177 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -35,10 +35,10 @@ $TRANSLATIONS = array(
 "Share" => "Kunhavigi",
 "Delete permanently" => "Forigi por ĉiam",
 "Rename" => "Alinomigi",
+"Error moving file" => "Eraris movo de dosiero",
+"Error" => "Eraro",
 "Pending" => "Traktotaj",
 "Could not rename file" => "Ne povis alinomiĝi dosiero",
-"replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
-"undo" => "malfari",
 "_%n folder_::_%n folders_" => array("%n dosierujo","%n dosierujoj"),
 "_%n file_::_%n files_" => array("%n dosiero","%n dosieroj"),
 "{dirs} and {files}" => "{dirs} kaj {files}",
@@ -46,8 +46,6 @@ $TRANSLATIONS = array(
 "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.",
-"Error moving file" => "Eraris movo de dosiero",
-"Error" => "Eraro",
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
@@ -75,7 +73,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 145c20eba46..10a378c371b 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renombrar",
+"Error moving file" => "Error moviendo archivo",
+"Error" => "Error",
 "Pending" => "Pendiente",
 "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 al borrar el archivo",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
 "_%n file_::_%n files_" => array("%n archivo","%n archivos"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
 "Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes.",
-"Error moving file" => "Error moviendo archivo",
-"Error" => "Error",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
@@ -90,7 +88,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 1bb2d6ef514..f78615fc923 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "Compartir",
 "Delete permanently" => "Borrar permanentemente",
 "Rename" => "Cambiar nombre",
+"Error moving file" => "Error moviendo el archivo",
+"Error" => "Error",
 "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"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "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",
@@ -85,7 +83,6 @@ $TRANSLATIONS = array(
 "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 4f5e35bd887..8e051d1c389 100644
--- a/apps/files/l10n/es_CL.php
+++ b/apps/files/l10n/es_CL.php
@@ -2,10 +2,10 @@
 $TRANSLATIONS = array(
 "Files" => "Archivos",
 "Share" => "Compartir",
+"Error" => "Error",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "Error",
 "Upload" => "Subir",
 "Download" => "Descargar"
 );
diff --git a/apps/files/l10n/es_MX.php b/apps/files/l10n/es_MX.php
index 27c75e11572..ea7db0d7b9c 100644
--- a/apps/files/l10n/es_MX.php
+++ b/apps/files/l10n/es_MX.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renombrar",
+"Error moving file" => "Error moviendo archivo",
+"Error" => "Error",
 "Pending" => "Pendiente",
 "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.",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
 "_%n file_::_%n files_" => array("%n archivo","%n archivos"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
 "Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes.",
-"Error moving file" => "Error moviendo archivo",
-"Error" => "Error",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
@@ -85,7 +83,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 2fcfe10f039..4f0614feb5e 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -3,7 +3,9 @@ $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.",
+"\"%s\" is an invalid file name." => "\"%s\" on vigane failinimi.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
+"The target folder has been moved or deleted." => "Sihtkataloog on ümber tõstetud või kustutatud.",
 "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",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "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",
+"Total file size {size1} exceeds upload limit {size2}" => "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
 "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.",
@@ -39,23 +43,22 @@ $TRANSLATIONS = array(
 "Share" => "Jaga",
 "Delete permanently" => "Kustuta jäädavalt",
 "Rename" => "Nimeta ümber",
+"Error moving file" => "Viga faili eemaldamisel",
+"Error" => "Viga",
 "Pending" => "Ootel",
 "Could not rename file" => "Ei suuda faili ümber nimetada",
-"replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
-"undo" => "tagasi",
 "Error deleting file." => "Viga faili kustutamisel.",
 "_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
 "_%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"),
+"\"{name}\" is an invalid file name." => "\"{name}\" on vigane failinimi.",
 "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.",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
 "Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
-"Error moving file" => "Viga faili eemaldamisel",
-"Error" => "Viga",
 "Name" => "Nimi",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
@@ -85,7 +88,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 bf4b9d56cf3..d59dd396283 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "Elkarbanatu",
 "Delete permanently" => "Ezabatu betirako",
 "Rename" => "Berrizendatu",
+"Error moving file" => "Errorea fitxategia mugitzean",
+"Error" => "Errorea",
 "Pending" => "Zain",
 "Could not rename file" => "Ezin izan da fitxategia berrizendatu",
-"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
-"undo" => "desegin",
 "Error deleting file." => "Errorea fitxategia ezabatzerakoan.",
 "_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
 "_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
 "Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
-"Error moving file" => "Errorea fitxategia mugitzean",
-"Error" => "Errorea",
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
@@ -85,7 +83,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/fa.php b/apps/files/l10n/fa.php
index 71316dc8fcc..2e8f6255e24 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -23,16 +23,14 @@ $TRANSLATIONS = array(
 "Share" => "اشتراک‌گذاری",
 "Delete permanently" => "حذف قطعی",
 "Rename" => "تغییرنام",
+"Error" => "خطا",
 "Pending" => "در انتظار",
-"replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.",
-"undo" => "بازگشت",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_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." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.",
-"Error" => "خطا",
 "Name" => "نام",
 "Size" => "اندازه",
 "Modified" => "تاریخ",
@@ -59,7 +57,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 6acea906fc4..b6383c144de 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -41,9 +41,10 @@ $TRANSLATIONS = array(
 "Share" => "Jaa",
 "Delete permanently" => "Poista pysyvästi",
 "Rename" => "Nimeä uudelleen",
+"Error moving file" => "Virhe tiedostoa siirrettäessä",
+"Error" => "Virhe",
 "Pending" => "Odottaa",
 "Could not rename file" => "Tiedoston nimeäminen uudelleen epäonnistui",
-"undo" => "kumoa",
 "Error deleting file." => "Virhe tiedostoa poistaessa.",
 "_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
 "_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
@@ -54,8 +55,6 @@ $TRANSLATIONS = array(
 "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.",
-"Error moving file" => "Virhe tiedostoa siirrettäessä",
-"Error" => "Virhe",
 "Name" => "Nimi",
 "Size" => "Koko",
 "Modified" => "Muokattu",
@@ -85,7 +84,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 ae748d19cca..0eed6a70f91 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Partager",
 "Delete permanently" => "Supprimer de façon définitive",
 "Rename" => "Renommer",
+"Error moving file" => "Erreur lors du déplacement du fichier",
+"Error" => "Erreur",
 "Pending" => "En attente",
 "Could not rename file" => "Impossible de renommer le fichier",
-"replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
-"undo" => "annuler",
 "Error deleting file." => "Erreur pendant la suppression du fichier.",
 "_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"),
 "_%n file_::_%n files_" => array("%n fichier","%n fichiers"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
-"Error moving file" => "Erreur lors du déplacement du fichier",
-"Error" => "Erreur",
 "Name" => "Nom",
 "Size" => "Taille",
 "Modified" => "Modifié",
@@ -90,7 +88,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 39bc427ea95..9fe6546de51 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renomear",
+"Error moving file" => "Produciuse un erro ao mover o ficheiro",
+"Error" => "Erro",
 "Pending" => "Pendentes",
 "Could not rename file" => "Non foi posíbel renomear o ficheiro",
-"replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}",
-"undo" => "desfacer",
 "Error deleting file." => "Produciuse un erro ao eliminar o ficheiro.",
 "_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
 "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
 "Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
-"Error moving file" => "Produciuse un erro ao mover o ficheiro",
-"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
@@ -90,7 +88,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 2035c8488bd..ab8640a91d1 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -23,14 +23,12 @@ $TRANSLATIONS = array(
 "Share" => "שתף",
 "Delete permanently" => "מחק לצמיתות",
 "Rename" => "שינוי שם",
+"Error" => "שגיאה",
 "Pending" => "ממתין",
-"replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
-"undo" => "ביטול",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Your storage is almost full ({usedSpacePercent}%)" => "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
-"Error" => "שגיאה",
 "Name" => "שם",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index ae01bfc47e1..b4234b51376 100644
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@@ -1,10 +1,10 @@
 <?php
 $TRANSLATIONS = array(
 "Share" => "साझा करें",
+"Error" => "त्रुटि",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "त्रुटि",
 "Upload" => "अपलोड ",
 "Save" => "सहेजें"
 );
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 5048a15c8bb..ef978e6cfb7 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -11,12 +11,11 @@ $TRANSLATIONS = array(
 "File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
 "Share" => "Podijeli",
 "Rename" => "Promjeni ime",
+"Error" => "Greška",
 "Pending" => "U tijeku",
-"undo" => "vrati",
 "_%n folder_::_%n folders_" => array("","",""),
 "_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"Error" => "Greška",
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 115635daa45..e4ab355c9b1 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "Megosztás",
 "Delete permanently" => "Végleges törlés",
 "Rename" => "Átnevezés",
+"Error moving file" => "Az állomány áthelyezése nem sikerült.",
+"Error" => "Hiba",
 "Pending" => "Folyamatban",
 "Could not rename file" => "Az állomány nem nevezhető át",
-"replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel:  {old_name}",
-"undo" => "visszavonás",
 "Error deleting file." => "Hiba a file törlése közben.",
 "_%n folder_::_%n folders_" => array("%n mappa","%n mappa"),
 "_%n file_::_%n files_" => array("%n állomány","%n állomány"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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!",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.",
-"Error moving file" => "Az állomány áthelyezése nem sikerült.",
-"Error" => "Hiba",
 "Name" => "Név",
 "Size" => "Méret",
 "Modified" => "Módosítva",
@@ -85,7 +83,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/ia.php b/apps/files/l10n/ia.php
index 82fd2e658d7..420e48395c7 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -5,10 +5,10 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Files" => "Files",
 "Share" => "Compartir",
+"Error" => "Error",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "Error",
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index d782218d18e..8356c5465eb 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -37,10 +37,10 @@ $TRANSLATIONS = array(
 "Share" => "Bagikan",
 "Delete permanently" => "Hapus secara permanen",
 "Rename" => "Ubah nama",
+"Error moving file" => "Galat saat memindahkan berkas",
+"Error" => "Galat",
 "Pending" => "Menunggu",
 "Could not rename file" => "Tidak dapat mengubah nama berkas",
-"replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}",
-"undo" => "urungkan",
 "Error deleting file." => "Galat saat menghapus berkas.",
 "_%n folder_::_%n folders_" => array("%n folder"),
 "_%n file_::_%n files_" => array("%n berkas"),
@@ -52,8 +52,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
 "Your download is being prepared. This might take some time if the files are big." => "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar.",
-"Error moving file" => "Galat saat memindahkan berkas",
-"Error" => "Galat",
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
@@ -83,7 +81,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 088cdefa304..00503028e0e 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -19,13 +19,11 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} er þegar til",
 "Share" => "Deila",
 "Rename" => "Endurskýra",
+"Error" => "Villa",
 "Pending" => "Bíður",
-"replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}",
-"undo" => "afturkalla",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "Villa",
 "Name" => "Nafn",
 "Size" => "Stærð",
 "Modified" => "Breytt",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index a0046b0e1c9..9539496a3fc 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Condividi",
 "Delete permanently" => "Elimina definitivamente",
 "Rename" => "Rinomina",
+"Error moving file" => "Errore durante lo spostamento del file",
+"Error" => "Errore",
 "Pending" => "In corso",
 "Could not rename file" => "Impossibile rinominare il file",
-"replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
-"undo" => "annulla",
 "Error deleting file." => "Errore durante l'eliminazione del file.",
 "_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
 "_%n file_::_%n files_" => array("%n file","%n file"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
 "Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
-"Error moving file" => "Errore durante lo spostamento del file",
-"Error" => "Errore",
 "Name" => "Nome",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
@@ -90,7 +88,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
index 8a4b3ca8774..dd8d4e4e3f6 100644
--- a/apps/files/l10n/ja.php
+++ b/apps/files/l10n/ja.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "共有",
 "Delete permanently" => "完全に削除する",
 "Rename" => "名前の変更",
+"Error moving file" => "ファイルの移動エラー",
+"Error" => "エラー",
 "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 個のファイル"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "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" => "更新日時",
@@ -90,7 +88,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/jv.php b/apps/files/l10n/jv.php
new file mode 100644
index 00000000000..cfab5af7d1c
--- /dev/null
+++ b/apps/files/l10n/jv.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Download" => "Njipuk"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 9e89c0b71b9..f9749d72bb4 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -21,16 +21,14 @@ $TRANSLATIONS = array(
 "Share" => "გაზიარება",
 "Delete permanently" => "სრულად წაშლა",
 "Rename" => "გადარქმევა",
+"Error" => "შეცდომა",
 "Pending" => "მოცდის რეჟიმში",
-"replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
-"undo" => "დაბრუნება",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "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." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.",
-"Error" => "შეცდომა",
 "Name" => "სახელი",
 "Size" => "ზომა",
 "Modified" => "შეცვლილია",
@@ -56,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/km.php b/apps/files/l10n/km.php
index 702c811ecf2..a7a01ccab9d 100644
--- a/apps/files/l10n/km.php
+++ b/apps/files/l10n/km.php
@@ -2,11 +2,10 @@
 $TRANSLATIONS = array(
 "Files" => "ឯកសារ",
 "Share" => "ចែក​រំលែក",
-"undo" => "មិន​ធ្វើ​វិញ",
+"Error" => "កំហុស",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
-"Error" => "កំហុស",
 "Name" => "ឈ្មោះ",
 "Size" => "ទំហំ",
 "Upload" => "ផ្ទុក​ឡើង",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index d00d09a148b..c0f0d7d4454 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "공유",
 "Delete permanently" => "영구히 삭제",
 "Rename" => "이름 바꾸기",
+"Error moving file" => "파일 이동 오류",
+"Error" => "오류",
 "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개"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "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" => "수정됨",
@@ -85,7 +83,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 c0141656f5d..6ec5819d380 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -2,10 +2,10 @@
 $TRANSLATIONS = array(
 "Files" => "په‌ڕگەکان",
 "Share" => "هاوبەشی کردن",
+"Error" => "هه‌ڵه",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "هه‌ڵه",
 "Name" => "ناو",
 "Upload" => "بارکردن",
 "Save" => "پاشکه‌وتکردن",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 822ca7e2d02..38b5d672d02 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -11,11 +11,10 @@ $TRANSLATIONS = array(
 "File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
 "Share" => "Deelen",
 "Rename" => "Ëm-benennen",
-"undo" => "réckgängeg man",
+"Error" => "Fehler",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "Fehler",
 "Name" => "Numm",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 2a76b7cb573..50097e5f362 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "Dalintis",
 "Delete permanently" => "Ištrinti negrįžtamai",
 "Rename" => "Pervadinti",
+"Error moving file" => "Klaida perkeliant failą",
+"Error" => "Klaida",
 "Pending" => "Laukiantis",
 "Could not rename file" => "Neįmanoma pervadinti failo",
-"replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
-"undo" => "anuliuoti",
 "Error deleting file." => "Klaida trinant failą.",
 "_%n folder_::_%n folders_" => array("%n aplankas","%n aplankai","%n aplankų"),
 "_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.",
 "Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.",
-"Error moving file" => "Klaida perkeliant failą",
-"Error" => "Klaida",
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
@@ -85,7 +83,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 179ccb994ba..fcb1a59aa38 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -23,9 +23,8 @@ $TRANSLATIONS = array(
 "Share" => "Dalīties",
 "Delete permanently" => "Dzēst pavisam",
 "Rename" => "Pārsaukt",
+"Error" => "Kļūda",
 "Pending" => "Gaida savu kārtu",
-"replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
-"undo" => "atsaukt",
 "_%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"),
@@ -33,7 +32,6 @@ $TRANSLATIONS = array(
 "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas.",
-"Error" => "Kļūda",
 "Name" => "Nosaukums",
 "Size" => "Izmērs",
 "Modified" => "Mainīts",
@@ -60,7 +58,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 c618b396f59..fa6efd1aff3 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -34,10 +34,10 @@ $TRANSLATIONS = array(
 "Share" => "Сподели",
 "Delete permanently" => "Трајно избришани",
 "Rename" => "Преименувај",
+"Error moving file" => "Грешка при префрлање на датотека",
+"Error" => "Грешка",
 "Pending" => "Чека",
 "Could not rename file" => "Не можам да ја преименувам датотеката",
-"replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
-"undo" => "врати",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "{dirs} and {files}" => "{dirs} и {files}",
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "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." => "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи.",
-"Error moving file" => "Грешка при префрлање на датотека",
-"Error" => "Грешка",
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
@@ -72,7 +70,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/ms_MY.php b/apps/files/l10n/ms_MY.php
index 0a7a50abb1a..df0054c3d00 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -11,11 +11,11 @@ $TRANSLATIONS = array(
 "Upload cancelled." => "Muatnaik dibatalkan.",
 "Share" => "Kongsi",
 "Rename" => "Namakan",
+"Error" => "Ralat",
 "Pending" => "Dalam proses",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
-"Error" => "Ralat",
 "Name" => "Nama",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 325ee0eb26c..f1e2c2edeeb 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "Del",
 "Delete permanently" => "Slett permanent",
 "Rename" => "Gi nytt navn",
+"Error moving file" => "Feil ved flytting av fil",
+"Error" => "Feil",
 "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"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "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",
@@ -85,7 +83,6 @@ $TRANSLATIONS = array(
 "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 9a25d383d41..946c7905b23 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Delen",
 "Delete permanently" => "Verwijder definitief",
 "Rename" => "Hernoem",
+"Error moving file" => "Fout bij verplaatsen bestand",
+"Error" => "Fout",
 "Pending" => "In behandeling",
 "Could not rename file" => "Kon niet hernoemen bestand",
-"replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
-"undo" => "ongedaan maken",
 "Error deleting file." => "Fout bij verwijderen bestand.",
 "_%n folder_::_%n folders_" => array("","%n mappen"),
 "_%n file_::_%n files_" => array("","%n bestanden"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
 "Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
-"Error moving file" => "Fout bij verplaatsen bestand",
-"Error" => "Fout",
 "Name" => "Naam",
 "Size" => "Grootte",
 "Modified" => "Aangepast",
@@ -90,7 +88,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 4072ea56be5..bd17fa3386a 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -27,9 +27,9 @@ $TRANSLATIONS = array(
 "Share" => "Del",
 "Delete permanently" => "Slett for godt",
 "Rename" => "Endra namn",
+"Error moving file" => "Feil ved flytting av fil",
+"Error" => "Feil",
 "Pending" => "Under vegs",
-"replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
-"undo" => "angre",
 "_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
 "_%n file_::_%n files_" => array("%n fil","%n filer"),
 "{dirs} and {files}" => "{dirs} og {files}",
@@ -38,8 +38,6 @@ $TRANSLATIONS = array(
 "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
-"Error moving file" => "Feil ved flytting av fil",
-"Error" => "Feil",
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
@@ -65,7 +63,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/oc.php b/apps/files/l10n/oc.php
index eb1a9038b08..7a24c81974e 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -11,12 +11,11 @@ $TRANSLATIONS = array(
 "File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
 "Share" => "Parteja",
 "Rename" => "Torna nomenar",
+"Error" => "Error",
 "Pending" => "Al esperar",
-"undo" => "defar",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "Error",
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
diff --git a/apps/files/l10n/pa.php b/apps/files/l10n/pa.php
index 63fcbe12dda..b18d2071e08 100644
--- a/apps/files/l10n/pa.php
+++ b/apps/files/l10n/pa.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
 "Files" => "ਫਾਇਲਾਂ",
 "Share" => "ਸਾਂਝਾ ਕਰੋ",
 "Rename" => "ਨਾਂ ਬਦਲੋ",
-"undo" => "ਵਾਪਸ",
+"Error" => "ਗਲਤੀ",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "ਗਲਤੀ",
 "Upload" => "ਅੱਪਲੋਡ",
 "Cancel upload" => "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ",
 "Download" => "ਡਾਊਨਲੋਡ",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index e4cbba3d07b..83126b3ea03 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Udostępnij",
 "Delete permanently" => "Trwale usuń",
 "Rename" => "Zmień nazwę",
+"Error moving file" => "Błąd prz przenoszeniu pliku",
+"Error" => "Błąd",
 "Pending" => "Oczekujące",
 "Could not rename file" => "Nie można zmienić nazwy pliku",
-"replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}",
-"undo" => "cofnij",
 "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"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.",
 "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.",
-"Error moving file" => "Błąd prz przenoszeniu pliku",
-"Error" => "Błąd",
 "Name" => "Nazwa",
 "Size" => "Rozmiar",
 "Modified" => "Modyfikacja",
@@ -90,7 +88,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/pl_PL.php b/apps/files/l10n/pl_PL.php
deleted file mode 100644
index b67f67b972e..00000000000
--- a/apps/files/l10n/pl_PL.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Zapisz"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 5f792a3b8cf..48c32e8887f 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Compartilhar",
 "Delete permanently" => "Excluir permanentemente",
 "Rename" => "Renomear",
+"Error moving file" => "Erro movendo o arquivo",
+"Error" => "Erro",
 "Pending" => "Pendente",
 "Could not rename file" => "Não foi possível renomear o arquivo",
-"replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
-"undo" => "desfazer",
 "Error deleting file." => "Erro eliminando o arquivo.",
 "_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
 "_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.",
 "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.",
-"Error moving file" => "Erro movendo o arquivo",
-"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
@@ -90,7 +88,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 5b4bc6993cd..0afb6b50157 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "Partilhar",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renomear",
+"Error moving file" => "Erro ao mover o ficheiro",
+"Error" => "Erro",
 "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"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "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",
-"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
@@ -85,7 +83,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 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 230e603083a..6cda724df43 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -4,7 +4,9 @@ $TRANSLATIONS = array(
 "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 while downloading %s to %s" => "Eroare la descarcarea %s in %s",
 "Error when creating the file" => "Eroare la crearea fisierului",
+"Folder name cannot be empty." => "Numele folderului nu poate fi liber.",
 "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",
@@ -32,10 +34,10 @@ $TRANSLATIONS = array(
 "Share" => "Partajează",
 "Delete permanently" => "Șterge permanent",
 "Rename" => "Redenumește",
+"Error moving file" => "Eroare la mutarea fișierului",
+"Error" => "Eroare",
 "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}",
@@ -44,8 +46,6 @@ $TRANSLATIONS = array(
 "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." => "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" => "Mărime",
 "Modified" => "Modificat",
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "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ș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",
-"Upgrading filesystem cache..." => "Actualizare fișiere de sistem cache..."
+"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 a07cfe20f4e..17f06c6a200 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -3,7 +3,9 @@ $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-адреса, пожалуйста, проверьте настройки сервера",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "Invalid directory." => "Неверный каталог.",
 "Files" => "Файлы",
 "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." => "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
@@ -39,23 +43,22 @@ $TRANSLATIONS = array(
 "Share" => "Открыть доступ",
 "Delete permanently" => "Удалить окончательно",
 "Rename" => "Переименовать",
+"Error moving file" => "Ошибка при перемещении файла",
+"Error" => "Ошибка",
 "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 file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
 "{dirs} and {files}" => "{dirs} и {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %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" => "Дата изменения",
@@ -85,7 +88,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/si_LK.php b/apps/files/l10n/si_LK.php
index 44decfef1b0..a2809ee2f5d 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -12,11 +12,10 @@ $TRANSLATIONS = array(
 "File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
 "Share" => "බෙදා හදා ගන්න",
 "Rename" => "නැවත නම් කරන්න",
-"undo" => "නිෂ්ප්‍රභ කරන්න",
+"Error" => "දෝෂයක්",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "දෝෂයක්",
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
 "Modified" => "වෙනස් කළ",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 8717e11337c..cffb89c294d 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -3,7 +3,9 @@ $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",
+"\"%s\" is an invalid file name." => "\"%s\" je neplatné meno súboru.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
+"The target folder has been moved or deleted." => "Cieľový priečinok bol premiestnený alebo odstránený.",
 "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.",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "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",
+"Total file size {size1} exceeds upload limit {size2}" => "Celková veľkosť súboru {size1} prekračuje upload limit {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
 "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.",
@@ -39,23 +43,22 @@ $TRANSLATIONS = array(
 "Share" => "Zdieľať",
 "Delete permanently" => "Zmazať  trvalo",
 "Rename" => "Premenovať",
+"Error moving file" => "Chyba pri presúvaní súboru",
+"Error" => "Chyba",
 "Pending" => "Prebieha",
 "Could not rename file" => "Nemožno premenovať súbor",
-"replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
-"undo" => "vrátiť",
 "Error deleting file." => "Chyba pri mazaní súboru.",
 "_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
 "_%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"),
+"\"{name}\" is an invalid file name." => "\"{name}\" je neplatné meno súboru.",
 "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.",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Š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.",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
-"Error moving file" => "Chyba pri presúvaní súboru",
-"Error" => "Chyba",
 "Name" => "Názov",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
@@ -85,7 +88,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 fb079eb42d0..fcb358bd7bd 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Souporaba",
 "Delete permanently" => "Izbriši dokončno",
 "Rename" => "Preimenuj",
+"Error moving file" => "Napaka premikanja datoteke",
+"Error" => "Napaka",
 "Pending" => "V čakanju ...",
 "Could not rename file" => "Ni mogoče preimenovati datoteke",
-"replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}",
-"undo" => "razveljavi",
 "Error deleting file." => "Napaka brisanja datoteke.",
 "_%n folder_::_%n folders_" => array("%n mapa","%n mapi","%n mape","%n map"),
 "_%n file_::_%n files_" => array("%n datoteka","%n datoteki","%n datoteke","%n datotek"),
@@ -59,8 +59,6 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifriranje je onemogočeno, datoteke pa so še vedno šifrirane. Odšifrirajte jih med nastavitvami.",
 "Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, kadar je datoteka zelo velika.",
-"Error moving file" => "Napaka premikanja datoteke",
-"Error" => "Napaka",
 "Name" => "Ime",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
@@ -90,7 +88,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 b4696c12b87..ade4f769faa 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -25,9 +25,9 @@ $TRANSLATIONS = array(
 "Share" => "Ndaj",
 "Delete permanently" => "Fshi përfundimisht",
 "Rename" => "Riemëro",
+"Error moving file" => "Gabim lëvizjen dokumentave",
+"Error" => "Gabim",
 "Pending" => "Në vijim",
-"replaced {new_name} with {old_name}" => "u zëvendësua {new_name} me {old_name}",
-"undo" => "anullo",
 "_%n folder_::_%n folders_" => array("%n dosje","%n dosje"),
 "_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
 "{dirs} and {files}" => "{dirs} dhe {files}",
@@ -36,8 +36,6 @@ $TRANSLATIONS = array(
 "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",
 "Modified" => "Ndryshuar",
@@ -64,7 +62,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 9220be0884c..44669e8167a 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -21,16 +21,14 @@ $TRANSLATIONS = array(
 "Share" => "Дели",
 "Delete permanently" => "Обриши за стално",
 "Rename" => "Преименуј",
+"Error" => "Грешка",
 "Pending" => "На чекању",
-"replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
-"undo" => "опозови",
 "_%n folder_::_%n folders_" => array("","",""),
 "_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "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." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.",
-"Error" => "Грешка",
 "Name" => "Име",
 "Size" => "Величина",
 "Modified" => "Измењено",
@@ -55,7 +53,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 67bf30d8606..a5c74860f78 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -8,10 +8,10 @@ $TRANSLATIONS = array(
 "Files" => "Fajlovi",
 "Share" => "Podeli",
 "Rename" => "Preimenij",
+"Error" => "Greška",
 "_%n folder_::_%n folders_" => array("","",""),
 "_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"Error" => "Greška",
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 0f8b9c1fe7a..f420216228c 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -3,9 +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.",
+"\"%s\" is an invalid file name." => "\"%s\" är ett ogiltigt filnamn.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
+"The target folder has been moved or deleted." => "Målmappen har flyttats eller tagits bort.",
 "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",
+"Server is not allowed to open URLs, please check the server configuration" => "Servern är inte tillåten att öppna URL:er, vänligen kontrollera server konfigurationen",
 "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.",
@@ -26,6 +29,8 @@ $TRANSLATIONS = array(
 "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.",
+"Total file size {size1} exceeds upload limit {size2}" => "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
 "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.",
@@ -34,26 +39,26 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} finns redan",
 "Could not create file" => "Kunde ej skapa fil",
 "Could not create folder" => "Kunde ej skapa katalog",
+"Error fetching URL" => "Fel vid hämtning av URL",
 "Share" => "Dela",
 "Delete permanently" => "Radera permanent",
 "Rename" => "Byt namn",
+"Error moving file" => "Fel uppstod vid flyttning av fil",
+"Error" => "Fel",
 "Pending" => "Väntar",
 "Could not rename file" => "Kan ej byta filnamn",
-"replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
-"undo" => "ångra",
 "Error deleting file." => "Kunde inte ta bort filen.",
 "_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
 "_%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"),
+"\"{name}\" is an invalid file name." => "\"{name}\" är ett ogiltligt filnamn.",
 "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",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "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.",
 "Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
-"Error moving file" => "Fel uppstod vid flyttning av fil",
-"Error" => "Fel",
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
@@ -69,6 +74,7 @@ $TRANSLATIONS = array(
 "Maximum input size for ZIP files" => "Största tillåtna storlek för ZIP-filer",
 "Save" => "Spara",
 "New" => "Ny",
+"New text file" => "Ny textfil",
 "Text file" => "Textfil",
 "New folder" => "Ny mapp",
 "Folder" => "Mapp",
@@ -82,7 +88,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 c0589feecea..257aacf1471 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -14,13 +14,11 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} ஏற்கனவே உள்ளது",
 "Share" => "பகிர்வு",
 "Rename" => "பெயர்மாற்றம்",
+"Error" => "வழு",
 "Pending" => "நிலுவையிலுள்ள",
-"replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
-"undo" => "முன் செயல் நீக்கம் ",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "வழு",
 "Name" => "பெயர்",
 "Size" => "அளவு",
 "Modified" => "மாற்றப்பட்டது",
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
index 155e4b5c201..b2cf4c01d8a 100644
--- a/apps/files/l10n/te.php
+++ b/apps/files/l10n/te.php
@@ -1,10 +1,10 @@
 <?php
 $TRANSLATIONS = array(
 "Delete permanently" => "శాశ్వతంగా తొలగించు",
+"Error" => "పొరపాటు",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "పొరపాటు",
 "Name" => "పేరు",
 "Size" => "పరిమాణం",
 "Save" => "భద్రపరచు",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 5e45bf4cd7b..8f5f15f2a34 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -20,16 +20,14 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} มีอยู่แล้วในระบบ",
 "Share" => "แชร์",
 "Rename" => "เปลี่ยนชื่อ",
+"Error" => "ข้อผิดพลาด",
 "Pending" => "อยู่ระหว่างดำเนินการ",
-"replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
-"undo" => "เลิกทำ",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "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." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
-"Error" => "ข้อผิดพลาด",
 "Name" => "ชื่อ",
 "Size" => "ขนาด",
 "Modified" => "แก้ไขแล้ว",
@@ -54,7 +52,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 01208430b0d..87c664cc171 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -29,7 +29,7 @@ $TRANSLATIONS = array(
 "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",
-"Total file size {size1} exceeds upload limit {size2}" => "Toplam dosya boyutu {size1} gönderme sınırını {size2} aşıyor",
+"Total file size {size1} exceeds upload limit {size2}" => "Toplam dosya boyutu {size1}, {size2} gönderme sınırını 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ı.",
@@ -43,10 +43,10 @@ $TRANSLATIONS = array(
 "Share" => "Paylaş",
 "Delete permanently" => "Kalıcı olarak sil",
 "Rename" => "İsim değiştir.",
+"Error moving file" => "Dosya taşıma hatası",
+"Error" => "Hata",
 "Pending" => "Bekliyor",
 "Could not rename file" => "Dosya adlandırılamadı",
-"replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi",
-"undo" => "geri al",
 "Error deleting file." => "Dosya silinirken hata.",
 "_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
 "_%n file_::_%n files_" => array("%n dosya","%n dosya"),
@@ -59,12 +59,10 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Ş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.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Ş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.",
 "Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.",
-"Error moving file" => "Dosya taşıma hatası",
-"Error" => "Hata",
 "Name" => "İsim",
 "Size" => "Boyut",
 "Modified" => "Değiştirilme",
-"Invalid folder name. Usage of 'Shared' is reserved." => "Geçersiz dizin adı. 'Shared' ismi ayrılmıştır.",
+"Invalid folder name. Usage of 'Shared' is reserved." => "Geçersiz klasör adı. 'Shared' ismi ayrılmıştır.",
 "%s could not be renamed" => "%s yeniden adlandırılamadı",
 "Upload" => "Yükle",
 "File handling" => "Dosya işlemleri",
@@ -90,7 +88,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 9a791522433..13354c153b2 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -13,12 +13,11 @@ $TRANSLATIONS = array(
 "Share" => "ھەمبەھىر",
 "Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
 "Rename" => "ئات ئۆزگەرت",
+"Error" => "خاتالىق",
 "Pending" => "كۈتۈۋاتىدۇ",
-"undo" => "يېنىۋال",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
-"Error" => "خاتالىق",
 "Name" => "ئاتى",
 "Size" => "چوڭلۇقى",
 "Modified" => "ئۆزگەرتكەن",
@@ -33,7 +32,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 c4a47dff408..905d27c3ee2 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -26,18 +26,16 @@ $TRANSLATIONS = array(
 "Share" => "Поділитися",
 "Delete permanently" => "Видалити назавжди",
 "Rename" => "Перейменувати",
+"Error moving file" => "Помилка переміщення файлу",
+"Error" => "Помилка",
 "Pending" => "Очікування",
 "Could not rename file" => "Неможливо перейменувати файл",
-"replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
-"undo" => "відмінити",
 "_%n folder_::_%n folders_" => array("%n тека","%n тека","%n теки"),
 "_%n file_::_%n files_" => array("%n файл","%n файлів","%n файли"),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "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." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.",
-"Error moving file" => "Помилка переміщення файлу",
-"Error" => "Помилка",
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
@@ -64,7 +62,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/ur_PK.php b/apps/files/l10n/ur_PK.php
index 3e13a7f516d..b9548acde92 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Error" => "ایرر",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Error" => "ایرر"
+"_Uploading %n file_::_Uploading %n files_" => array("","")
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index c20314a7da3..55f9bd25942 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -37,10 +37,10 @@ $TRANSLATIONS = array(
 "Share" => "Chia sẻ",
 "Delete permanently" => "Xóa vĩnh vễn",
 "Rename" => "Sửa tên",
+"Error moving file" => "Lỗi di chuyển tập tin",
+"Error" => "Lỗi",
 "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",
 "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"),
@@ -51,8 +51,6 @@ $TRANSLATIONS = array(
 "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",
@@ -81,7 +79,6 @@ $TRANSLATIONS = array(
 "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 eec0d718aae..068f97c1ddf 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -39,10 +39,10 @@ $TRANSLATIONS = array(
 "Share" => "分享",
 "Delete permanently" => "永久删除",
 "Rename" => "重命名",
+"Error moving file" => "移动文件错误",
+"Error" => "错误",
 "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个文件"),
@@ -54,8 +54,6 @@ $TRANSLATIONS = array(
 "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" => "修改日期",
@@ -85,7 +83,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/zh_HK.php b/apps/files/l10n/zh_HK.php
index 4885500ce43..eaa32cd537a 100644
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@@ -2,10 +2,10 @@
 $TRANSLATIONS = array(
 "Files" => "文件",
 "Share" => "分享",
+"Error" => "錯誤",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
-"Error" => "錯誤",
 "Name" => "名稱",
 "Upload" => "上傳",
 "Save" => "儲存",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 6a4ef90bcd7..154efd563fd 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -37,10 +37,10 @@ $TRANSLATIONS = array(
 "Share" => "分享",
 "Delete permanently" => "永久刪除",
 "Rename" => "重新命名",
+"Error moving file" => "移動檔案失敗",
+"Error" => "錯誤",
 "Pending" => "等候中",
 "Could not rename file" => "無法重新命名",
-"replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
-"undo" => "復原",
 "_%n folder_::_%n folders_" => array("%n 個資料夾"),
 "_%n file_::_%n files_" => array("%n 個檔案"),
 "{dirs} and {files}" => "{dirs} 和 {files}",
@@ -51,8 +51,6 @@ $TRANSLATIONS = array(
 "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" => "修改時間",
@@ -80,7 +78,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/app.php b/apps/files/lib/app.php
index fea88faa92a..adfca669577 100644
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -84,25 +84,7 @@ class App {
 		) {
 			// successful rename
 			$meta = $this->view->getFileInfo($dir . '/' . $newname);
-			if ($meta['mimetype'] === 'httpd/unix-directory') {
-				$meta['type'] = 'dir';
-			}
-			else {
-				$meta['type'] = 'file';
-			}
-			// these need to be set for determineIcon()
-			$meta['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($meta['mimetype']);
-			$meta['directory'] = $dir;
-			$fileinfo = array(
-				'id' => $meta['fileid'],
-				'mime' => $meta['mimetype'],
-				'size' => $meta['size'],
-				'etag' => $meta['etag'],
-				'directory' => $meta['directory'],
-				'name' => $newname,
-				'isPreviewAvailable' => $meta['isPreviewAvailable'],
-				'icon' => \OCA\Files\Helper::determineIcon($meta)
-			);
+			$fileinfo = \OCA\Files\Helper::formatFileInfo($meta);
 			$result['success'] = true;
 			$result['data'] = $fileinfo;
 		} else {
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index c41e2d15581..b765fdaf3e3 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -19,11 +19,17 @@ class Helper
 					 'usedSpacePercent'  => (int)$storageInfo['relative']);
 	}
 
+	/**
+	 * Determine icon for a given file
+	 *
+	 * @param \OC\Files\FileInfo $file file info
+	 * @return string icon URL
+	 */
 	public static function determineIcon($file) {
 		if($file['type'] === 'dir') {
 			$dir = $file['directory'];
 			$icon = \OC_Helper::mimetypeIcon('dir');
-			$absPath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir.'/'.$file['name']);
+			$absPath = $file->getPath();
 			$mount = \OC\Files\Filesystem::getMountManager()->find($absPath);
 			if (!is_null($mount)) {
 				$sid = $mount->getStorageId();
@@ -38,11 +44,7 @@ class Helper
 				}
 			}
 		}else{
-			if($file['isPreviewAvailable']) {
-				$pathForPreview = $file['directory'] . '/' . $file['name'];
-				return \OC_Helper::previewIcon($pathForPreview) . '&c=' . $file['etag'];
-			}
-			$icon = \OC_Helper::mimetypeIcon($file['mimetype']);
+			$icon = \OC_Helper::mimetypeIcon($file->getMimetype());
 		}
 
 		return substr($icon, 0, -3) . 'svg';
@@ -69,52 +71,58 @@ class Helper
 	}
 
 	/**
-	 * Retrieves the contents of the given directory and
-	 * returns it as a sorted array.
-	 * @param string $dir path to the directory
-	 * @return array of files
+	 * Formats the file info to be returned as JSON to the client.
+	 *
+	 * @param \OCP\Files\FileInfo file info
+	 * @return array formatted file info
 	 */
-	public static function getFiles($dir) {
-		$content = \OC\Files\Filesystem::getDirectoryContent($dir);
-		$files = array();
+	public static function formatFileInfo($i) {
+		$entry = array();
 
-		foreach ($content as $i) {
-			$i['date'] = \OCP\Util::formatDate($i['mtime']);
-			if ($i['type'] === 'file') {
-				$fileinfo = pathinfo($i['name']);
-				$i['basename'] = $fileinfo['filename'];
-				if (!empty($fileinfo['extension'])) {
-					$i['extension'] = '.' . $fileinfo['extension'];
-				} else {
-					$i['extension'] = '';
-				}
-			}
-			$i['directory'] = $dir;
-			$i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
-			$i['icon'] = \OCA\Files\Helper::determineIcon($i);
-			$files[] = $i;
+		$entry['id'] = $i['fileid'];
+		$entry['date'] = \OCP\Util::formatDate($i['mtime']);
+		$entry['mtime'] = $i['mtime'] * 1000;
+		// only pick out the needed attributes
+		$entry['icon'] = \OCA\Files\Helper::determineIcon($i);
+		if (\OC::$server->getPreviewManager()->isMimeSupported($i['mimetype'])) {
+			$entry['isPreviewAvailable'] = true;
+		}
+		$entry['name'] = $i['name'];
+		$entry['permissions'] = $i['permissions'];
+		$entry['mimetype'] = $i['mimetype'];
+		$entry['size'] = $i['size'];
+		$entry['type'] = $i['type'];
+		$entry['etag'] = $i['etag'];
+		if (isset($i['displayname_owner'])) {
+			$entry['shareOwner'] = $i['displayname_owner'];
 		}
+		return $entry;
+	}
 
-		usort($files, array('\OCA\Files\Helper', 'fileCmp'));
+	/**
+	 * Format file info for JSON
+	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
+	 */
+	public static function formatFileInfos($fileInfos) {
+		$files = array();
+		foreach ($fileInfos as $i) {
+			$files[] = self::formatFileInfo($i);
+		}
 
 		return $files;
 	}
 
 	/**
-	 * Splits the given path into a breadcrumb structure.
-	 * @param string $dir path to process
-	 * @return array where each entry is a hash of the absolute
-	 * directory path and its name
+	 * Retrieves the contents of the given directory and
+	 * returns it as a sorted array of FileInfo.
+	 *
+	 * @param string $dir path to the directory
+	 * @return \OCP\Files\FileInfo[] files
 	 */
-	public static function makeBreadcrumb($dir){
-		$breadcrumb = array();
-		$pathtohere = '';
-		foreach (explode('/', $dir) as $i) {
-			if ($i !== '') {
-				$pathtohere .= '/' . $i;
-				$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
-			}
-		}
-		return $breadcrumb;
+	public static function getFiles($dir) {
+		$content = \OC\Files\Filesystem::getDirectoryContent($dir);
+
+		usort($content, array('\OCA\Files\Helper', 'fileCmp'));
+		return $content;
 	}
 }
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index a5afd55fbc3..5f7d3261d6c 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -1,28 +1,26 @@
 <?php OCP\Util::addscript('files', 'admin'); ?>
 
-<form name="filesForm" action='#' method='post'>
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('File handling')); ?></h2>
-		<?php if($_['uploadChangable']):?>
-			<label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>
-			<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>'/>
-			<?php if($_['displayMaxPossibleUploadSize']):?>
-				(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>)
-			<?php endif;?>
-			<br/>
+<form name="filesForm" class="section" action="#" method="post">
+	<h2><?php p($l->t('File handling')); ?></h2>
+	<?php if($_['uploadChangable']):?>
+		<label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>
+		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>'/>
+		<?php if($_['displayMaxPossibleUploadSize']):?>
+			(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>)
 		<?php endif;?>
-		<input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1"
-			   title="<?php p($l->t( 'Needed for multi-file and folder downloads.' )); ?>"
-			   <?php if ($_['allowZipDownload']): ?> checked="checked"<?php endif; ?> />
-		<label for="allowZipDownload"><?php p($l->t( 'Enable ZIP-download' )); ?></label><br/>
+		<br/>
+	<?php endif;?>
+	<input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1"
+		   title="<?php p($l->t( 'Needed for multi-file and folder downloads.' )); ?>"
+		   <?php if ($_['allowZipDownload']): ?> checked="checked"<?php endif; ?> />
+	<label for="allowZipDownload"><?php p($l->t( 'Enable ZIP-download' )); ?></label><br/>
 
-		<input type="text" name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php p($_['maxZipInputSize']) ?>'
-			   title="<?php p($l->t( '0 is unlimited' )); ?>"
-			   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
-		<em><?php p($l->t( 'Maximum input size for ZIP files' )); ?> </em><br />
+	<input type="text" name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php p($_['maxZipInputSize']) ?>'
+		   title="<?php p($l->t( '0 is unlimited' )); ?>"
+		   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
+	<em><?php p($l->t( 'Maximum input size for ZIP files' )); ?> </em><br />
 
-		<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
-		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
-			   value="<?php p($l->t( 'Save' )); ?>"/>
-	</fieldset>
+	<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
+	<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
+		   value="<?php p($l->t( 'Save' )); ?>"/>
 </form>
diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
index 662177ac7ed..79beccef3e5 100644
--- a/apps/files/templates/fileexists.html
+++ b/apps/files/templates/fileexists.html
@@ -3,8 +3,8 @@
 	<span class="what">{what}<!-- If you select both versions, the copied file will have a number added to its name. --></span><br/>
 	<br/>
 	<table>
-		<th><label><input class="allnewfiles" type="checkbox" />New Files<span class="count"></span></label></th>
-		<th><label><input class="allexistingfiles" type="checkbox" />Already existing files<span class="count"></span></label></th>
+		<th><label><input class="allnewfiles" type="checkbox" />{allnewfiles}<span class="count"></span></label></th>
+		<th><label><input class="allexistingfiles" type="checkbox" />{allexistingfiles}<span class="count"></span></label></th>
 	</table>
 	<div class="conflicts">
 		<div class="template">
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 5b0bad7f341..95edd625cb3 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,19 +1,18 @@
 <div id="controls">
-	<?php print_unescaped($_['breadcrumb']); ?>
-		<div class="actions creatable <?php if (!$_['isCreatable']):?>hidden<?php endif; ?>">
+		<div class="actions creatable hidden">
 			<?php if(!isset($_['dirToken'])):?>
 			<div id="new" class="button">
 				<a><?php p($l->t('New'));?></a>
 				<ul>
-					<li class="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-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-link" data-type="web">
+					<li class="icon-link svg" data-type="web">
 						<p><?php p($l->t('From link'));?></p>
 					</li>
 				</ul>
@@ -48,20 +47,20 @@
 			</div>
 		</div>
 		<div id="file_action_panel"></div>
-		<div class="notCreatable notPublic <?php if ($_['isCreatable'] or $_['isPublic'] ):?>hidden<?php endif; ?>">
+		<div class="notCreatable notPublic hidden">
 			<?php p($l->t('You don’t have permission to upload or create files here'))?>
 		</div>
 	<input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
 </div>
 
-<div id="emptycontent" <?php if (!$_['emptyContent']):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Upload something!'))?></div>
+<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Upload something!'))?></div>
 
 <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>" />
 
 <table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
 	<thead>
 		<tr>
-			<th <?php if (!$_['fileHeader']):?>class="hidden"<?php endif; ?> id='headerName'>
+			<th class="hidden" id='headerName'>
 				<div id="headerName-container">
 					<input type="checkbox" id="select_all" />
 					<label for="select_all"></label>
@@ -77,8 +76,8 @@
 					</span>
 				</div>
 			</th>
-			<th <?php if (!$_['fileHeader']):?>class="hidden"<?php endif; ?> id="headerSize"><?php p($l->t('Size')); ?></th>
-			<th <?php if (!$_['fileHeader']):?>class="hidden"<?php endif; ?> id="headerDate">
+			<th class="hidden" id="headerSize"><?php p($l->t('Size')); ?></th>
+			<th class="hidden" id="headerDate">
 				<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
 				<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
 					<span class="selectedActions"><a href="" class="delete-selected">
@@ -91,7 +90,6 @@
 		</tr>
 	</thead>
 	<tbody id="fileList">
-		<?php print_unescaped($_['fileList']); ?>
 	</tbody>
 </table>
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
@@ -111,7 +109,6 @@
 
 <!-- config hints for javascript -->
 <input type="hidden" name="filesApp" id="filesApp" value="1" />
-<input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
 <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
 <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
 <?php if (!$_['isPublic']) :?>
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
deleted file mode 100644
index 2a0df622767..00000000000
--- a/apps/files/templates/part.breadcrumb.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="crumb <?php if(!count($_["breadcrumb"])) p('last');?>" data-dir=''>
-	<a href="<?php print_unescaped($_['baseURL']); ?>">
-		<?php if(isset($_['rootBreadCrumb'])):
-			echo $_['rootBreadCrumb'];
-		else:?>
-			<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
-		<?php endif;?>
-	</a>
-</div>
-<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
-	$crumb = $_["breadcrumb"][$i];
-	$dir = \OCP\Util::encodePath($crumb["dir"]); ?>
-	<div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg"
-		 data-dir='<?php p($dir);?>'>
-	<a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
-	</div>
-<?php endfor;
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
deleted file mode 100644
index 8a7a1e370eb..00000000000
--- a/apps/files/templates/part.list.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php $totalfiles = 0;
-$totaldirs = 0;
-$totalsize = 0; ?>
-<?php foreach($_['files'] as $file):
-	// the bigger the file, the darker the shade of grey; megabytes*2
-	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
-	if($simple_size_color<0) $simple_size_color = 0;
-	$relative_modified_date = OCP\relative_modified_date($file['mtime']);
-	// the older the file, the brighter the shade of grey; days*14
-	$relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
-	if($relative_date_color>160) $relative_date_color = 160;
-	$name = \OCP\Util::encodePath($file['name']);
-	$directory = \OCP\Util::encodePath($file['directory']); ?>
-	<tr data-id="<?php p($file['fileid']); ?>"
-		data-file="<?php p($name);?>"
-		data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
-		data-mime="<?php p($file['mimetype'])?>"
-		data-size="<?php p($file['size']);?>"
-		data-etag="<?php p($file['etag']);?>"
-		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: ?>
-		<td class="filename svg"
-		<?php endif; ?>
-		    style="background-image:url(<?php print_unescaped($file['icon']); ?>)"
-			>
-		<?php if(!isset($_['readonly']) || !$_['readonly']): ?>
-			<input id="select-<?php p($file['fileid']); ?>" type="checkbox" />
-			<label for="select-<?php p($file['fileid']); ?>"></label>
-		<?php endif; ?>
-		<?php if($file['type'] == 'dir'): ?>
-			<a class="name" href="<?php p(rtrim($_['baseURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title="">
-				<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; ?>
-		</td>
-		<td class="filesize"
-			style="color:rgb(<?php p($simple_size_color.','.$simple_size_color.','.$simple_size_color) ?>)">
-				<?php print_unescaped(OCP\human_file_size($file['size'])); ?>
-		</td>
-		<td class="date">
-			<span class="modified"
-				  title="<?php p($file['date']); ?>"
-				  style="color:rgb(<?php p($relative_date_color.','
-												.$relative_date_color.','
-												.$relative_date_color) ?>)">
-				<?php p($relative_modified_date); ?>
-			</span>
-		</td>
-	</tr>
-<?php endforeach;
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index e53c0fb3dd1..cb62d22a7e2 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -92,28 +92,32 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 
 		$this->viewMock->expects($this->any())
 			->method('getFileInfo')
-			->will($this->returnValue(array(
+			->will($this->returnValue(new \OC\Files\FileInfo(
+				'/test',
+				null,
+				'/test',	
+				array(
 				'fileid' => 123,
 				'type' => 'dir',
 				'mimetype' => 'httpd/unix-directory',
+				'mtime' => 0,
+				'permissions' => 31,
 				'size' => 18,
 				'etag' => 'abcdef',
 				'directory' => '/',
 				'name' => 'new_name',
-			)));
+			))));
 
 		$result = $this->files->rename($dir, $oldname, $newname);
 
 		$this->assertTrue($result['success']);
 		$this->assertEquals(123, $result['data']['id']);
 		$this->assertEquals('new_name', $result['data']['name']);
-		$this->assertEquals('/test', $result['data']['directory']);
 		$this->assertEquals(18, $result['data']['size']);
-		$this->assertEquals('httpd/unix-directory', $result['data']['mime']);
+		$this->assertEquals('httpd/unix-directory', $result['data']['mimetype']);
 		$icon = \OC_Helper::mimetypeIcon('dir');
 		$icon = substr($icon, 0, -3) . 'svg';
 		$this->assertEquals($icon, $result['data']['icon']);
-		$this->assertFalse($result['data']['isPreviewAvailable']);
 	}
 
 	/**
@@ -148,29 +152,33 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 
 		$this->viewMock->expects($this->any())
 			->method('getFileInfo')
-			->will($this->returnValue(array(
+			->will($this->returnValue(new \OC\Files\FileInfo(
+				'/',
+				null,
+				'/',
+				array(
 				'fileid' => 123,
 				'type' => 'dir',
 				'mimetype' => 'httpd/unix-directory',
+				'mtime' => 0,
+				'permissions' => 31,
 				'size' => 18,
 				'etag' => 'abcdef',
 				'directory' => '/',
 				'name' => 'new_name',
-			)));
+			))));
 
 		$result = $this->files->rename($dir, $oldname, $newname);
 
 		$this->assertTrue($result['success']);
 		$this->assertEquals(123, $result['data']['id']);
-		$this->assertEquals('newname', $result['data']['name']);
-		$this->assertEquals('/', $result['data']['directory']);
+		$this->assertEquals('new_name', $result['data']['name']);
 		$this->assertEquals(18, $result['data']['size']);
-		$this->assertEquals('httpd/unix-directory', $result['data']['mime']);
+		$this->assertEquals('httpd/unix-directory', $result['data']['mimetype']);
 		$this->assertEquals('abcdef', $result['data']['etag']);
 		$icon = \OC_Helper::mimetypeIcon('dir');
 		$icon = substr($icon, 0, -3) . 'svg';
 		$this->assertEquals($icon, $result['data']['icon']);
-		$this->assertFalse($result['data']['isPreviewAvailable']);
 	}
 
 	/**
diff --git a/apps/files/tests/js/breadcrumbSpec.js b/apps/files/tests/js/breadcrumbSpec.js
new file mode 100644
index 00000000000..1bfe5308a27
--- /dev/null
+++ b/apps/files/tests/js/breadcrumbSpec.js
@@ -0,0 +1,248 @@
+/**
+* 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 BreadCrumb */
+describe('BreadCrumb tests', function() {
+	describe('Rendering', function() {
+		var bc;
+		beforeEach(function() {
+			bc = new BreadCrumb({
+				getCrumbUrl: function(part, index) {
+					// for testing purposes
+					return part.dir + '#' + index;
+				}
+			});
+		});
+		afterEach(function() {
+			bc = null;
+		});
+		it('Renders its own container', function() {
+			bc.render();
+			expect(bc.$el.hasClass('breadcrumb')).toEqual(true);
+		});
+		it('Renders root by default', function() {
+			var $crumbs;
+			bc.render();
+			$crumbs = bc.$el.find('.crumb');
+			expect($crumbs.length).toEqual(1);
+			expect($crumbs.eq(0).find('a').attr('href')).toEqual('/#0');
+			expect($crumbs.eq(0).find('img').length).toEqual(1);
+			expect($crumbs.eq(0).attr('data-dir')).toEqual('/');
+		});
+		it('Renders root when switching to root', function() {
+			var $crumbs;
+			bc.setDirectory('/somedir');
+			bc.setDirectory('/');
+			$crumbs = bc.$el.find('.crumb');
+			expect($crumbs.length).toEqual(1);
+			expect($crumbs.eq(0).attr('data-dir')).toEqual('/');
+		});
+		it('Renders last crumb with "last" class', function() {
+			bc.setDirectory('/abc/def');
+			expect(bc.$el.find('.crumb:last').hasClass('last')).toEqual(true);
+		});
+		it('Renders single path section', function() {
+			var $crumbs;
+			bc.setDirectory('/somedir');
+			$crumbs = bc.$el.find('.crumb');
+			expect($crumbs.length).toEqual(2);
+			expect($crumbs.eq(0).find('a').attr('href')).toEqual('/#0');
+			expect($crumbs.eq(0).find('img').length).toEqual(1);
+			expect($crumbs.eq(0).attr('data-dir')).toEqual('/');
+			expect($crumbs.eq(1).find('a').attr('href')).toEqual('/somedir#1');
+			expect($crumbs.eq(1).find('img').length).toEqual(0);
+			expect($crumbs.eq(1).attr('data-dir')).toEqual('/somedir');
+		});
+		it('Renders multiple path sections and special chars', function() {
+			var $crumbs;
+			bc.setDirectory('/somedir/with space/abc');
+			$crumbs = bc.$el.find('.crumb');
+			expect($crumbs.length).toEqual(4);
+			expect($crumbs.eq(0).find('a').attr('href')).toEqual('/#0');
+			expect($crumbs.eq(0).find('img').length).toEqual(1);
+			expect($crumbs.eq(0).attr('data-dir')).toEqual('/');
+
+			expect($crumbs.eq(1).find('a').attr('href')).toEqual('/somedir#1');
+			expect($crumbs.eq(1).find('img').length).toEqual(0);
+			expect($crumbs.eq(1).attr('data-dir')).toEqual('/somedir');
+
+			expect($crumbs.eq(2).find('a').attr('href')).toEqual('/somedir/with space#2');
+			expect($crumbs.eq(2).find('img').length).toEqual(0);
+			expect($crumbs.eq(2).attr('data-dir')).toEqual('/somedir/with space');
+
+			expect($crumbs.eq(3).find('a').attr('href')).toEqual('/somedir/with space/abc#3');
+			expect($crumbs.eq(3).find('img').length).toEqual(0);
+			expect($crumbs.eq(3).attr('data-dir')).toEqual('/somedir/with space/abc');
+		});
+	});
+	describe('Events', function() {
+		it('Calls onClick handler when clicking on a crumb', function() {
+			var handler = sinon.stub();
+			var bc = new BreadCrumb({
+				onClick: handler
+			});
+			bc.setDirectory('/one/two/three/four');
+			bc.$el.find('.crumb:eq(3)').click();
+			expect(handler.calledOnce).toEqual(true);
+			expect(handler.getCall(0).thisValue).toEqual(bc.$el.find('.crumb').get(3));
+
+			handler.reset();
+			bc.$el.find('.crumb:eq(0) a').click();
+			expect(handler.calledOnce).toEqual(true);
+			expect(handler.getCall(0).thisValue).toEqual(bc.$el.find('.crumb').get(0));
+		});
+		it('Calls onDrop handler when dropping on a crumb', function() {
+			var droppableStub = sinon.stub($.fn, 'droppable');
+			var handler = sinon.stub();
+			var bc = new BreadCrumb({
+				onDrop: handler
+			});
+			bc.setDirectory('/one/two/three/four');
+			expect(droppableStub.calledOnce).toEqual(true);
+
+			expect(droppableStub.getCall(0).args[0].drop).toBeDefined();
+			// simulate drop
+			droppableStub.getCall(0).args[0].drop({dummy: true});
+
+			expect(handler.calledOnce).toEqual(true);
+			expect(handler.getCall(0).args[0]).toEqual({dummy: true});
+
+			droppableStub.restore();
+		});
+	});
+	describe('Resizing', function() {
+		var bc, widthStub, dummyDir,
+			oldUpdateTotalWidth;
+
+		beforeEach(function() {
+			dummyDir = '/short name/longer name/looooooooooooonger/even longer long long long longer long/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/last one';
+
+			oldUpdateTotalWidth = BreadCrumb.prototype._updateTotalWidth;
+			BreadCrumb.prototype._updateTotalWidth = function() {
+				// need to set display:block for correct offsetWidth (no CSS loaded here)
+				$('div.crumb').css({
+					'display': 'block',
+					'float': 'left'
+				});
+
+				return oldUpdateTotalWidth.apply(this, arguments);
+			};
+
+			bc = new BreadCrumb();
+			widthStub = sinon.stub($.fn, 'width');
+			// append dummy navigation and controls
+			// as they are currently used for measurements
+			$('#testArea').append(
+				'<div id="navigation" style="width: 80px"></div>',
+				'<div id="controls"></div>'
+			);
+
+			// make sure we know the test screen width
+			$('#testArea').css('width', 1280);
+
+			// use test area as we need it for measurements
+			$('#controls').append(bc.$el);
+			$('#controls').append('<div class="actions"><div>Dummy action with a given width</div></div>');
+		});
+		afterEach(function() {
+			BreadCrumb.prototype._updateTotalWidth = oldUpdateTotalWidth;
+			widthStub.restore();
+			bc = null;
+		});
+		it('Hides breadcrumbs to fit window', function() {
+			var $crumbs;
+
+			widthStub.returns(500);
+			// triggers resize implicitly
+			bc.setDirectory(dummyDir);
+			$crumbs = bc.$el.find('.crumb');
+
+			// first one is always visible
+			expect($crumbs.eq(0).hasClass('hidden')).toEqual(false);
+			// second one has ellipsis
+			expect($crumbs.eq(1).hasClass('hidden')).toEqual(false);
+			expect($crumbs.eq(1).find('.ellipsis').length).toEqual(1);
+			// there is only one ellipsis in total
+			expect($crumbs.find('.ellipsis').length).toEqual(1);
+			// subsequent elements are hidden
+			expect($crumbs.eq(2).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(3).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(4).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(5).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(6).hasClass('hidden')).toEqual(false);
+		});
+		it('Updates ellipsis on window size increase', function() {
+			var $crumbs;
+
+			widthStub.returns(500);
+			// triggers resize implicitly
+			bc.setDirectory(dummyDir);
+			$crumbs = bc.$el.find('.crumb');
+
+			// simulate increase
+			$('#testArea').css('width', 1800);
+			bc.resize(1800);
+
+			// first one is always visible
+			expect($crumbs.eq(0).hasClass('hidden')).toEqual(false);
+			// second one has ellipsis
+			expect($crumbs.eq(1).hasClass('hidden')).toEqual(false);
+			expect($crumbs.eq(1).find('.ellipsis').length).toEqual(1);
+			// there is only one ellipsis in total
+			expect($crumbs.find('.ellipsis').length).toEqual(1);
+			// subsequent elements are hidden
+			expect($crumbs.eq(2).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(3).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(4).hasClass('hidden')).toEqual(true);
+			// the rest is visible
+			expect($crumbs.eq(5).hasClass('hidden')).toEqual(false);
+			expect($crumbs.eq(6).hasClass('hidden')).toEqual(false);
+		});
+		it('Updates ellipsis on window size decrease', function() {
+			var $crumbs;
+
+			$('#testArea').css('width', 2000);
+			widthStub.returns(2000);
+			// triggers resize implicitly
+			bc.setDirectory(dummyDir);
+			$crumbs = bc.$el.find('.crumb');
+
+			// simulate decrease
+			bc.resize(500);
+			$('#testArea').css('width', 500);
+
+			// first one is always visible
+			expect($crumbs.eq(0).hasClass('hidden')).toEqual(false);
+			// second one has ellipsis
+			expect($crumbs.eq(1).hasClass('hidden')).toEqual(false);
+			expect($crumbs.eq(1).find('.ellipsis').length).toEqual(1);
+			// there is only one ellipsis in total
+			expect($crumbs.find('.ellipsis').length).toEqual(1);
+			// subsequent elements are hidden
+			expect($crumbs.eq(2).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(3).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(4).hasClass('hidden')).toEqual(true);
+			// the rest is visible
+			expect($crumbs.eq(5).hasClass('hidden')).toEqual(true);
+			expect($crumbs.eq(6).hasClass('hidden')).toEqual(false);
+		});
+	});
+});
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index ef7ddcb874a..3c22c84b866 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -22,6 +22,7 @@
 /* global OC, FileActions, FileList */
 describe('FileActions tests', function() {
 	var $filesTable;
+
 	beforeEach(function() {
 		// init horrible parameters
 		var $body = $('body');
@@ -34,42 +35,83 @@ describe('FileActions tests', function() {
 		$('#dir, #permissions, #filestable').remove();
 	});
 	it('calling display() sets file actions', function() {
-		// note: download_url is actually the link target, not the actual download URL...
-		var $tr = FileList.addFile('testName.txt', 1234, new Date(), false, false, {download_url: 'test/download/url'});
-
-		// no actions before call
-		expect($tr.find('.action[data-action=Download]').length).toEqual(0);
-		expect($tr.find('.action[data-action=Rename]').length).toEqual(0);
-		expect($tr.find('.action.delete').length).toEqual(0);
+		var fileData = {
+			id: 18,
+			type: 'file',
+			name: 'testName.txt',
+			mimetype: 'plain/text',
+			size: '1234',
+			etag: 'a01234c',
+			mtime: '123456'
+		};
 
-		FileActions.display($tr.find('td.filename'), true);
+		// note: FileActions.display() is called implicitly
+		var $tr = FileList.add(fileData);
 
-		// actions defined after cal
-		expect($tr.find('.action[data-action=Download]').length).toEqual(1);
-		expect($tr.find('.nametext .action[data-action=Rename]').length).toEqual(1);
+		// actions defined after call
+		expect($tr.find('.action.action-download').length).toEqual(1);
+		expect($tr.find('.action.action-download').attr('data-action')).toEqual('Download');
+		expect($tr.find('.nametext .action.action-rename').length).toEqual(1);
+		expect($tr.find('.nametext .action.action-rename').attr('data-action')).toEqual('Rename');
 		expect($tr.find('.action.delete').length).toEqual(1);
 	});
 	it('calling display() twice correctly replaces file actions', function() {
-		var $tr = FileList.addFile('testName.txt', 1234, new Date(), false, false, {download_url: 'test/download/url'});
+		var fileData = {
+			id: 18,
+			type: 'file',
+			name: 'testName.txt',
+			mimetype: 'plain/text',
+			size: '1234',
+			etag: 'a01234c',
+			mtime: '123456'
+		};
+		var $tr = FileList.add(fileData);
 
 		FileActions.display($tr.find('td.filename'), true);
 		FileActions.display($tr.find('td.filename'), true);
 
 		// actions defined after cal
-		expect($tr.find('.action[data-action=Download]').length).toEqual(1);
-		expect($tr.find('.nametext .action[data-action=Rename]').length).toEqual(1);
+		expect($tr.find('.action.action-download').length).toEqual(1);
+		expect($tr.find('.nametext .action.action-rename').length).toEqual(1);
 		expect($tr.find('.action.delete').length).toEqual(1);
 	});
 	it('redirects to download URL when clicking download', function() {
 		var redirectStub = sinon.stub(OC, 'redirect');
-		// note: download_url is actually the link target, not the actual download URL...
-		var $tr = FileList.addFile('test download File.txt', 1234, new Date(), false, false, {download_url: 'test/download/url'});
+		var fileData = {
+			id: 18,
+			type: 'file',
+			name: 'testName.txt',
+			mimetype: 'plain/text',
+			size: '1234',
+			etag: 'a01234c',
+			mtime: '123456'
+		};
+		var $tr = FileList.add(fileData);
 		FileActions.display($tr.find('td.filename'), true);
 
-		$tr.find('.action[data-action=Download]').click();
+		$tr.find('.action-download').click();
 
 		expect(redirectStub.calledOnce).toEqual(true);
-		expect(redirectStub.getCall(0).args[0]).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=test%20download%20File.txt');
+		expect(redirectStub.getCall(0).args[0]).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
 		redirectStub.restore();
 	});
+	it('deletes file when clicking delete', function() {
+		var deleteStub = sinon.stub(FileList, 'do_delete');
+		var fileData = {
+			id: 18,
+			type: 'file',
+			name: 'testName.txt',
+			mimetype: 'plain/text',
+			size: '1234',
+			etag: 'a01234c',
+			mtime: '123456'
+		};
+		var $tr = FileList.add(fileData);
+		FileActions.display($tr.find('td.filename'), true);
+
+		$tr.find('.action.delete').click();
+
+		expect(deleteStub.calledOnce).toEqual(true);
+		deleteStub.restore();
+	});
 });
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 8f4cb86ab4a..ca85a360cf5 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -21,6 +21,9 @@
 
 /* global OC, FileList */
 describe('FileList tests', function() {
+	var testFiles, alertStub, notificationStub,
+		pushStateStub;
+
 	beforeEach(function() {
 		// init horrible parameters
 		var $body = $('body');
@@ -28,45 +31,784 @@ describe('FileList tests', function() {
 		$body.append('<input type="hidden" id="permissions" value="31"></input>');
 		// dummy files table
 		$body.append('<table id="filestable"></table>');
+
+		// prevents URL changes during tests
+		pushStateStub = sinon.stub(window.history, 'pushState');
+
+		alertStub = sinon.stub(OC.dialogs, 'alert');
+		notificationStub = sinon.stub(OC.Notification, 'show');
+
+		// init parameters and test table elements
+		$('#testArea').append(
+			'<input type="hidden" id="dir" value="/subdir"></input>' +
+			'<input type="hidden" id="permissions" value="31"></input>' +
+			// dummy controls
+			'<div id="controls">' +
+			'   <div class="actions creatable"></div>' +
+			'   <div class="notCreatable"></div>' +
+			'</div>' +
+			// dummy table
+			'<table id="filestable">' +
+			'<thead><tr><th class="hidden">Name</th></tr></thead>' +
+		   	'<tbody id="fileList"></tbody>' +
+			'</table>' +
+			'<div id="emptycontent">Empty content message</div>'
+		);
+
+		testFiles = [{
+			id: 1,
+			type: 'file',
+			name: 'One.txt',
+			mimetype: 'text/plain',
+			size: 12
+		}, {
+			id: 2,
+			type: 'file',
+			name: 'Two.jpg',
+			mimetype: 'image/jpeg',
+			size: 12049
+		}, {
+			id: 3,
+			type: 'file',
+			name: 'Three.pdf',
+			mimetype: 'application/pdf',
+			size: 58009
+		}, {
+			id: 4,
+			type: 'dir',
+			name: 'somedir',
+			mimetype: 'httpd/unix-directory',
+			size: 250
+		}];
+
+		FileList.initialize();
 	});
 	afterEach(function() {
+		testFiles = undefined;
+		FileList.initialized = false;
+		FileList.isEmpty = true;
+		delete FileList._reloadCall;
+
 		$('#dir, #permissions, #filestable').remove();
+		notificationStub.restore();
+		alertStub.restore();
+		pushStateStub.restore();
+	});
+	describe('Getters', function() {
+		it('Returns the current directory', function() {
+			$('#dir').val('/one/two/three');
+			expect(FileList.getCurrentDirectory()).toEqual('/one/two/three');
+		});
+		it('Returns the directory permissions as int', function() {
+			$('#permissions').val('23');
+			expect(FileList.getDirectoryPermissions()).toEqual(23);
+		});
+	});
+	describe('Adding files', function() {
+		var clock, now;
+		beforeEach(function() {
+			// to prevent date comparison issues
+			clock = sinon.useFakeTimers();
+			now = new Date();
+		});
+		afterEach(function() {
+			clock.restore();
+		});
+		it('generates file element with correct attributes when calling add() with file data', function() {
+			var fileData = {
+				id: 18,
+				type: 'file',
+				name: 'testName.txt',
+				mimetype: 'plain/text',
+				size: '1234',
+				etag: 'a01234c',
+				mtime: '123456'
+			};
+			var $tr = FileList.add(fileData);
+
+			expect($tr).toBeDefined();
+			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
+			expect($tr.attr('data-id')).toEqual('18');
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('testName.txt');
+			expect($tr.attr('data-size')).toEqual('1234');
+			expect($tr.attr('data-etag')).toEqual('a01234c');
+			expect($tr.attr('data-permissions')).toEqual('31');
+			expect($tr.attr('data-mime')).toEqual('plain/text');
+			expect($tr.attr('data-mtime')).toEqual('123456');
+			expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
+
+			expect($tr.find('.filesize').text()).toEqual('1 kB');
+			expect(FileList.findFileEl('testName.txt')[0]).toEqual($tr[0]);
+		});
+		it('generates dir element with correct attributes when calling add() with dir data', function() {
+			var fileData = {
+				id: 19,
+				type: 'dir',
+				name: 'testFolder',
+				mimetype: 'httpd/unix-directory',
+				size: '1234',
+				etag: 'a01234c',
+				mtime: '123456'
+			};
+			var $tr = FileList.add(fileData);
+
+			expect($tr).toBeDefined();
+			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
+			expect($tr.attr('data-id')).toEqual('19');
+			expect($tr.attr('data-type')).toEqual('dir');
+			expect($tr.attr('data-file')).toEqual('testFolder');
+			expect($tr.attr('data-size')).toEqual('1234');
+			expect($tr.attr('data-etag')).toEqual('a01234c');
+			expect($tr.attr('data-permissions')).toEqual('31');
+			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+			expect($tr.attr('data-mtime')).toEqual('123456');
+
+			expect($tr.find('.filesize').text()).toEqual('1 kB');
+
+			expect(FileList.findFileEl('testFolder')[0]).toEqual($tr[0]);
+		});
+		it('generates file element with default attributes when calling add() with minimal data', function() {
+			var fileData = {
+				type: 'file',
+				name: 'testFile.txt'
+			};
+
+		    clock.tick(123456);
+			var $tr = FileList.add(fileData);
+
+			expect($tr).toBeDefined();
+			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
+			expect($tr.attr('data-id')).toEqual(null);
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('testFile.txt');
+			expect($tr.attr('data-size')).toEqual(null);
+			expect($tr.attr('data-etag')).toEqual(null);
+			expect($tr.attr('data-permissions')).toEqual('31');
+			expect($tr.attr('data-mime')).toEqual(null);
+			expect($tr.attr('data-mtime')).toEqual('123456');
+
+			expect($tr.find('.filesize').text()).toEqual('Pending');
+		});
+		it('generates dir element with default attributes when calling add() with minimal data', function() {
+			var fileData = {
+				type: 'dir',
+				name: 'testFolder'
+			};
+		    clock.tick(123456);
+			var $tr = FileList.add(fileData);
+
+			expect($tr).toBeDefined();
+			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
+			expect($tr.attr('data-id')).toEqual(null);
+			expect($tr.attr('data-type')).toEqual('dir');
+			expect($tr.attr('data-file')).toEqual('testFolder');
+			expect($tr.attr('data-size')).toEqual(null);
+			expect($tr.attr('data-etag')).toEqual(null);
+			expect($tr.attr('data-permissions')).toEqual('31');
+			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+			expect($tr.attr('data-mtime')).toEqual('123456');
+
+			expect($tr.find('.filesize').text()).toEqual('Pending');
+		});
+		it('generates file element with zero size when size is explicitly zero', function() {
+			var fileData = {
+				type: 'dir',
+				name: 'testFolder',
+				size: '0'
+			};
+			var $tr = FileList.add(fileData);
+			expect($tr.find('.filesize').text()).toEqual('0 B');
+		});
+		it('adds new file to the end of the list before the summary', function() {
+			var fileData = {
+				type: 'file',
+				name: 'P comes after O.txt'
+			};
+			FileList.setFiles(testFiles);
+			$tr = FileList.add(fileData);
+			expect($tr.index()).toEqual(4);
+			expect($tr.next().hasClass('summary')).toEqual(true);
+		});
+		it('adds new file at correct position in insert mode', function() {
+			var fileData = {
+				type: 'file',
+				name: 'P comes after O.txt'
+			};
+			FileList.setFiles(testFiles);
+			$tr = FileList.add(fileData, {insert: true});
+			// after "One.txt"
+			expect($tr.index()).toEqual(1);
+		});
+		it('removes empty content message and shows summary when adding first file', function() {
+			var fileData = {
+				type: 'file',
+				name: 'first file.txt',
+				size: 12
+			};
+			FileList.setFiles([]);
+			expect(FileList.isEmpty).toEqual(true);
+			FileList.add(fileData);
+			$summary = $('#fileList .summary');
+			expect($summary.length).toEqual(1);
+			// yes, ugly...
+			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
+			expect($summary.find('.filesize').text()).toEqual('12 B');
+			expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
+			expect($('#emptycontent').hasClass('hidden')).toEqual(true);
+			expect(FileList.isEmpty).toEqual(false);
+		});
 	});
-	it('generates file element with correct attributes when calling addFile', function() {
-		var lastMod = new Date(10000);
-		// note: download_url is actually the link target, not the actual download URL...
-		var $tr = FileList.addFile('testName.txt', 1234, lastMod, false, false, {download_url: 'test/download/url'});
-
-		expect($tr).toBeDefined();
-		expect($tr[0].tagName.toLowerCase()).toEqual('tr');
-		expect($tr.find('a:first').attr('href')).toEqual('test/download/url');
-		expect($tr.attr('data-type')).toEqual('file');
-		expect($tr.attr('data-file')).toEqual('testName.txt');
-		expect($tr.attr('data-size')).toEqual('1234');
-		expect($tr.attr('data-permissions')).toEqual('31');
-		//expect($tr.attr('data-mime')).toEqual('plain/text');
+	describe('Removing files from the list', function() {
+		it('Removes file from list when calling remove() and updates summary', function() {
+			var $removedEl;
+			FileList.setFiles(testFiles);
+			$removedEl = FileList.remove('One.txt');
+			expect($removedEl).toBeDefined();
+			expect($removedEl.attr('data-file')).toEqual('One.txt');
+			expect($('#fileList tr:not(.summary)').length).toEqual(3);
+			expect(FileList.findFileEl('One.txt').length).toEqual(0);
+
+			$summary = $('#fileList .summary');
+			expect($summary.length).toEqual(1);
+			expect($summary.find('.info').text()).toEqual('1 folder and 2 files');
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
+			expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
+			expect($summary.find('.filesize').text()).toEqual('69 kB');
+			expect(FileList.isEmpty).toEqual(false);
+		});
+		it('Shows empty content when removing last file', function() {
+			FileList.setFiles([testFiles[0]]);
+			FileList.remove('One.txt');
+			expect($('#fileList tr:not(.summary)').length).toEqual(0);
+			expect(FileList.findFileEl('One.txt').length).toEqual(0);
+
+			$summary = $('#fileList .summary');
+			expect($summary.length).toEqual(0);
+			expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
+			expect($('#emptycontent').hasClass('hidden')).toEqual(false);
+			expect(FileList.isEmpty).toEqual(true);
+		});
 	});
-	it('generates dir element with correct attributes when calling addDir', function() {
-		var lastMod = new Date(10000);
-		var $tr = FileList.addDir('testFolder', 1234, lastMod, false);
-
-		expect($tr).toBeDefined();
-		expect($tr[0].tagName.toLowerCase()).toEqual('tr');
-		expect($tr.attr('data-type')).toEqual('dir');
-		expect($tr.attr('data-file')).toEqual('testFolder');
-		expect($tr.attr('data-size')).toEqual('1234');
-		expect($tr.attr('data-permissions')).toEqual('31');
-		//expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+	describe('Deleting files', function() {
+		function doDelete() {
+			var request, query;
+			// note: normally called from FileActions
+			FileList.do_delete(['One.txt', 'Two.jpg']);
+
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/delete.php');
+
+			query = fakeServer.requests[0].requestBody;
+			expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir', files: '["One.txt","Two.jpg"]'});
+		}
+		it('calls delete.php, removes the deleted entries and updates summary', function() {
+			FileList.setFiles(testFiles);
+			doDelete();
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			expect(FileList.findFileEl('One.txt').length).toEqual(0);
+			expect(FileList.findFileEl('Two.jpg').length).toEqual(0);
+			expect(FileList.findFileEl('Three.pdf').length).toEqual(1);
+			expect(FileList.$fileList.find('tr:not(.summary)').length).toEqual(2);
+
+			$summary = $('#fileList .summary');
+			expect($summary.length).toEqual(1);
+			expect($summary.find('.info').text()).toEqual('1 folder and 1 file');
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
+			expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
+			expect($summary.find('.filesize').text()).toEqual('57 kB');
+			expect(FileList.isEmpty).toEqual(false);
+			expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
+			expect($('#emptycontent').hasClass('hidden')).toEqual(true);
+
+			expect(notificationStub.notCalled).toEqual(true);
+		});
+		it('updates summary when deleting last file', function() {
+			FileList.setFiles([testFiles[0], testFiles[1]]);
+			doDelete();
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			expect(FileList.$fileList.find('tr:not(.summary)').length).toEqual(0);
+
+			$summary = $('#fileList .summary');
+			expect($summary.length).toEqual(0);
+			expect(FileList.isEmpty).toEqual(true);
+			expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
+			expect($('#emptycontent').hasClass('hidden')).toEqual(false);
+		});
+		it('bring back deleted item when delete call failed', function() {
+			FileList.setFiles(testFiles);
+			doDelete();
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'error', data: {message: 'WOOT'}})
+			);
+
+			// files are still in the list
+			expect(FileList.findFileEl('One.txt').length).toEqual(1);
+			expect(FileList.findFileEl('Two.jpg').length).toEqual(1);
+			expect(FileList.$fileList.find('tr:not(.summary)').length).toEqual(4);
+
+			expect(notificationStub.calledOnce).toEqual(true);
+		});
+	});
+	describe('Renaming files', function() {
+		function doRename() {
+			var $input, request;
+
+			FileList.setFiles(testFiles);
+
+			// trigger rename prompt
+			FileList.rename('One.txt');
+			$input = FileList.$fileList.find('input.filename');
+			$input.val('One_renamed.txt').blur();
+
+			expect(fakeServer.requests.length).toEqual(1);
+			var request = fakeServer.requests[0];
+			expect(request.url.substr(0, request.url.indexOf('?'))).toEqual(OC.webroot + '/index.php/apps/files/ajax/rename.php');
+			expect(OC.parseQueryString(request.url)).toEqual({'dir': '/subdir', newname: 'One_renamed.txt', file: 'One.txt'});
+
+			// element is renamed before the request finishes
+			expect(FileList.findFileEl('One.txt').length).toEqual(0);
+			expect(FileList.findFileEl('One_renamed.txt').length).toEqual(1);
+			// input is gone
+			expect(FileList.$fileList.find('input.filename').length).toEqual(0);
+		}
+		it('Keeps renamed file entry if rename ajax call suceeded', function() {
+			doRename();
+
+			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'success',
+				data: {
+					name: 'One_renamed.txt'
+				}
+			}));
+
+			// element stays renamed
+			expect(FileList.findFileEl('One.txt').length).toEqual(0);
+			expect(FileList.findFileEl('One_renamed.txt').length).toEqual(1);
+
+			expect(alertStub.notCalled).toEqual(true);
+		});
+		it('Reverts file entry if rename ajax call failed', function() {
+			doRename();
+
+			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'error',
+				data: {
+					message: 'Something went wrong'
+				}
+			}));
+
+			// element was reverted
+			expect(FileList.findFileEl('One.txt').length).toEqual(1);
+			expect(FileList.findFileEl('One_renamed.txt').length).toEqual(0);
+
+			expect(alertStub.calledOnce).toEqual(true);
+		});
+		it('Correctly updates file link after rename', function() {
+			var $tr;
+			doRename();
+
+			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'success',
+				data: {
+					name: 'One_renamed.txt'
+				}
+			}));
+
+			$tr = FileList.findFileEl('One_renamed.txt');
+			expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=One_renamed.txt');
+		});
+		// FIXME: fix this in the source code!
+		xit('Correctly updates file link after rename when path has same name', function() {
+			var $tr;
+			// evil case: because of buggy code
+			$('#dir').val('/One.txt/subdir');
+			doRename();
+
+			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'success',
+				data: {
+					name: 'One_renamed.txt'
+				}
+			}));
+
+			$tr = FileList.findFileEl('One_renamed.txt');
+			expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=One.txt');
+		});
+	});
+	describe('List rendering', function() {
+		it('renders a list of files using add()', function() {
+			var addSpy = sinon.spy(FileList, 'add');
+			FileList.setFiles(testFiles);
+			expect(addSpy.callCount).toEqual(4);
+			expect($('#fileList tr:not(.summary)').length).toEqual(4);
+			addSpy.restore();
+		});
+		it('updates summary using the file sizes', function() {
+			var $summary;
+			FileList.setFiles(testFiles);
+			$summary = $('#fileList .summary');
+			expect($summary.length).toEqual(1);
+			expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+			expect($summary.find('.filesize').text()).toEqual('69 kB');
+		});
+		it('shows headers, summary and hide empty content message after setting files', function(){
+			FileList.setFiles(testFiles);
+			expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
+			expect($('#emptycontent').hasClass('hidden')).toEqual(true);
+			expect(FileList.$fileList.find('.summary').length).toEqual(1);
+		});
+		it('hides headers, summary and show empty content message after setting empty file list', function(){
+			FileList.setFiles([]);
+			expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
+			expect($('#emptycontent').hasClass('hidden')).toEqual(false);
+			expect(FileList.$fileList.find('.summary').length).toEqual(0);
+		});
+		it('hides headers, empty content message, and summary when list is empty and user has no creation permission', function(){
+			$('#permissions').val(0);
+			FileList.setFiles([]);
+			expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
+			expect($('#emptycontent').hasClass('hidden')).toEqual(true);
+			expect(FileList.$fileList.find('.summary').length).toEqual(0);
+		});
+		it('calling findFileEl() can find existing file element', function() {
+			FileList.setFiles(testFiles);
+			expect(FileList.findFileEl('Two.jpg').length).toEqual(1);
+		});
+		it('calling findFileEl() returns empty when file not found in file', function() {
+			FileList.setFiles(testFiles);
+			expect(FileList.findFileEl('unexist.dat').length).toEqual(0);
+		});
+		it('only add file if in same current directory', function() {
+			$('#dir').val('/current dir');
+			var fileData = {
+				type: 'file',
+				name: 'testFile.txt',
+				directory: '/current dir'
+			};
+			var $tr = FileList.add(fileData);
+			expect(FileList.findFileEl('testFile.txt').length).toEqual(1);
+		});
+		it('triggers "fileActionsReady" event after update', function() {
+			var handler = sinon.stub();
+			FileList.$fileList.on('fileActionsReady', handler);
+			FileList.setFiles(testFiles);
+			expect(handler.calledOnce).toEqual(true);
+		});
+		it('triggers "updated" event after update', function() {
+			var handler = sinon.stub();
+			FileList.$fileList.on('updated', handler);
+			FileList.setFiles(testFiles);
+			expect(handler.calledOnce).toEqual(true);
+		});
+	});
+	describe('file previews', function() {
+		var previewLoadStub;
+
+		function getImageUrl($el) {
+			// might be slightly different cross-browser
+			var url = $el.css('background-image');
+			var r = url.match(/url\(['"]?([^'")]*)['"]?\)/);
+			if (!r) {
+				return url;
+			}
+			return r[1];
+		}
+
+		beforeEach(function() {
+			previewLoadStub = sinon.stub(Files, 'lazyLoadPreview');
+		});
+		afterEach(function() {
+			previewLoadStub.restore();
+		});
+		it('renders default icon for file when none provided and no preview is available', function() {
+			var fileData = {
+				type: 'file',
+				name: 'testFile.txt'
+			};
+			var $tr = FileList.add(fileData);
+			var $td = $tr.find('td.filename');
+			expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
+			expect(previewLoadStub.notCalled).toEqual(true);
+		});
+		it('renders default icon for dir when none provided and no preview is available', function() {
+			var fileData = {
+				type: 'dir',
+				name: 'test dir'
+			};
+			var $tr = FileList.add(fileData);
+			var $td = $tr.find('td.filename');
+			expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/folder.svg');
+			expect(previewLoadStub.notCalled).toEqual(true);
+		});
+		it('renders provided icon for file when provided', function() {
+			var fileData = {
+				type: 'file',
+				name: 'test dir',
+				icon: OC.webroot + '/core/img/filetypes/application-pdf.svg'
+			};
+			var $tr = FileList.add(fileData);
+			var $td = $tr.find('td.filename');
+			expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/application-pdf.svg');
+			expect(previewLoadStub.notCalled).toEqual(true);
+		});
+		it('renders preview when no icon was provided and preview is available', function() {
+			var fileData = {
+				type: 'file',
+				name: 'test dir',
+				isPreviewAvailable: true
+			};
+			var $tr = FileList.add(fileData);
+			var $td = $tr.find('td.filename');
+			expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
+			expect(previewLoadStub.calledOnce).toEqual(true);
+			// third argument is callback
+			previewLoadStub.getCall(0).args[2](OC.webroot + '/somepath.png');
+			expect(getImageUrl($td)).toEqual(OC.webroot + '/somepath.png');
+		});
+		it('renders default file type icon when no icon was provided and no preview is available', function() {
+			var fileData = {
+				type: 'file',
+				name: 'test dir',
+				isPreviewAvailable: false
+			};
+			var $tr = FileList.add(fileData);
+			var $td = $tr.find('td.filename');
+			expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
+			expect(previewLoadStub.notCalled).toEqual(true);
+		});
+	});
+	describe('viewer mode', function() {
+		it('enabling viewer mode hides files table and action buttons', function() {
+			FileList.setViewerMode(true);
+			expect($('#filestable').hasClass('hidden')).toEqual(true);
+			expect($('.actions').hasClass('hidden')).toEqual(true);
+			expect($('.notCreatable').hasClass('hidden')).toEqual(true);
+		});
+		it('disabling viewer mode restores files table and action buttons', function() {
+			FileList.setViewerMode(true);
+			FileList.setViewerMode(false);
+			expect($('#filestable').hasClass('hidden')).toEqual(false);
+			expect($('.actions').hasClass('hidden')).toEqual(false);
+			expect($('.notCreatable').hasClass('hidden')).toEqual(true);
+		});
+		it('disabling viewer mode restores files table and action buttons with correct permissions', function() {
+			$('#permissions').val(0);
+			FileList.setViewerMode(true);
+			FileList.setViewerMode(false);
+			expect($('#filestable').hasClass('hidden')).toEqual(false);
+			expect($('.actions').hasClass('hidden')).toEqual(true);
+			expect($('.notCreatable').hasClass('hidden')).toEqual(false);
+		});
+	});
+	describe('loading file list', function() {
+		beforeEach(function() {
+			var data = {
+				status: 'success',
+				data: {
+					files: testFiles,
+					permissions: 31
+				}
+			};
+			fakeServer.respondWith(/\/index\.php\/apps\/files\/ajax\/list.php\?dir=%2F(subdir|anothersubdir)/, [
+					200, {
+						"Content-Type": "application/json"
+					},
+					JSON.stringify(data)
+			]);
+		});
+		it('fetches file list from server and renders it when reload() is called', function() {
+			FileList.reload();
+			expect(fakeServer.requests.length).toEqual(1);
+			var url = fakeServer.requests[0].url;
+			var query = url.substr(url.indexOf('?') + 1);
+			expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir'});
+			fakeServer.respond();
+			expect($('#fileList tr:not(.summary)').length).toEqual(4);
+			expect(FileList.findFileEl('One.txt').length).toEqual(1);
+		});
+		it('switches dir and fetches file list when calling changeDirectory()', function() {
+			FileList.changeDirectory('/anothersubdir');
+			expect(FileList.getCurrentDirectory()).toEqual('/anothersubdir');
+			expect(fakeServer.requests.length).toEqual(1);
+			var url = fakeServer.requests[0].url;
+			var query = url.substr(url.indexOf('?') + 1);
+			expect(OC.parseQueryString(query)).toEqual({'dir': '/anothersubdir'});
+			fakeServer.respond();
+		});
+		it('switches to root dir when current directory does not exist', function() {
+			fakeServer.respondWith(/\/index\.php\/apps\/files\/ajax\/list.php\?dir=%2funexist/, [
+					404, {
+						"Content-Type": "application/json"
+					},
+					''
+			]);
+			FileList.changeDirectory('/unexist');
+			fakeServer.respond();
+			expect(FileList.getCurrentDirectory()).toEqual('/');
+		});
+		it('shows mask before loading file list then hides it at the end', function() {
+			var showMaskStub = sinon.stub(FileList, 'showMask');
+			var hideMaskStub = sinon.stub(FileList, 'hideMask');
+			FileList.changeDirectory('/anothersubdir');
+			expect(showMaskStub.calledOnce).toEqual(true);
+			expect(hideMaskStub.calledOnce).toEqual(false);
+			fakeServer.respond();
+			expect(showMaskStub.calledOnce).toEqual(true);
+			expect(hideMaskStub.calledOnce).toEqual(true);
+			showMaskStub.restore();
+			hideMaskStub.restore();
+		});
+		it('changes URL to target dir', function() {
+			FileList.changeDirectory('/somedir');
+			expect(pushStateStub.calledOnce).toEqual(true);
+			expect(pushStateStub.getCall(0).args[0]).toEqual({dir: '/somedir'});
+			expect(pushStateStub.getCall(0).args[2]).toEqual(OC.webroot + '/index.php/apps/files?dir=/somedir');
+		});
+		it('refreshes breadcrumb after update', function() {
+			var setDirSpy = sinon.spy(FileList.breadcrumb, 'setDirectory');
+			FileList.changeDirectory('/anothersubdir');
+			fakeServer.respond();
+			expect(FileList.breadcrumb.setDirectory.calledOnce).toEqual(true);
+			expect(FileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
+			setDirSpy.restore();
+		});
+	});
+	describe('breadcrumb events', function() {
+		beforeEach(function() {
+			var data = {
+				status: 'success',
+				data: {
+					files: testFiles,
+					permissions: 31
+				}
+			};
+			fakeServer.respondWith(/\/index\.php\/apps\/files\/ajax\/list.php\?dir=%2Fsubdir/, [
+					200, {
+						"Content-Type": "application/json"
+					},
+					JSON.stringify(data)
+			]);
+		});
+		it('clicking on root breadcrumb changes directory to root', function() {
+			FileList.changeDirectory('/subdir/two/three with space/four/five');
+			fakeServer.respond();
+			var changeDirStub = sinon.stub(FileList, 'changeDirectory');
+			FileList.breadcrumb.$el.find('.crumb:eq(0)').click();
+
+			expect(changeDirStub.calledOnce).toEqual(true);
+			expect(changeDirStub.getCall(0).args[0]).toEqual('/');
+			changeDirStub.restore();
+		});
+		it('clicking on breadcrumb changes directory', function() {
+			FileList.changeDirectory('/subdir/two/three with space/four/five');
+			fakeServer.respond();
+			var changeDirStub = sinon.stub(FileList, 'changeDirectory');
+			FileList.breadcrumb.$el.find('.crumb:eq(3)').click();
+
+			expect(changeDirStub.calledOnce).toEqual(true);
+			expect(changeDirStub.getCall(0).args[0]).toEqual('/subdir/two/three with space');
+			changeDirStub.restore();
+		});
+		it('dropping files on breadcrumb calls move operation', function() {
+			var request, query, testDir = '/subdir/two/three with space/four/five';
+			FileList.changeDirectory(testDir);
+			fakeServer.respond();
+			var $crumb = FileList.breadcrumb.$el.find('.crumb:eq(3)');
+			// no idea what this is but is required by the handler
+			var ui = {
+				helper: {
+					find: sinon.stub()
+				}
+			};
+			// returns a list of tr that were dragged
+			// FIXME: why are their attributes different than the
+			// regular file trs ?
+			ui.helper.find.returns([
+				$('<tr data-filename="One.txt" data-dir="' + testDir + '"></tr>'),
+				$('<tr data-filename="Two.jpg" data-dir="' + testDir + '"></tr>')
+			]);
+			// simulate drop event
+			FileList._onDropOnBreadCrumb.call($crumb, new $.Event('drop'), ui);
+
+			// will trigger two calls to move.php (first one was previous list.php)
+			expect(fakeServer.requests.length).toEqual(3);
+
+			request = fakeServer.requests[1];
+			expect(request.method).toEqual('POST');
+			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/move.php');
+			query = OC.parseQueryString(request.requestBody);
+			expect(query).toEqual({
+				target: '/subdir/two/three with space',
+				dir: testDir,
+				file: 'One.txt'
+			});
+
+			request = fakeServer.requests[2];
+			expect(request.method).toEqual('POST');
+			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/move.php');
+			query = OC.parseQueryString(request.requestBody);
+			expect(query).toEqual({
+				target: '/subdir/two/three with space',
+				dir: testDir,
+				file: 'Two.jpg'
+			});
+		});
+		it('dropping files on same dir breadcrumb does nothing', function() {
+			var request, query, testDir = '/subdir/two/three with space/four/five';
+			FileList.changeDirectory(testDir);
+			fakeServer.respond();
+			var $crumb = FileList.breadcrumb.$el.find('.crumb:last');
+			// no idea what this is but is required by the handler
+			var ui = {
+				helper: {
+					find: sinon.stub()
+				}
+			};
+			// returns a list of tr that were dragged
+			// FIXME: why are their attributes different than the
+			// regular file trs ?
+			ui.helper.find.returns([
+				$('<tr data-filename="One.txt" data-dir="' + testDir + '"></tr>'),
+				$('<tr data-filename="Two.jpg" data-dir="' + testDir + '"></tr>')
+			]);
+			// simulate drop event
+			FileList._onDropOnBreadCrumb.call($crumb, new $.Event('drop'), ui);
+
+			// no extra server request
+			expect(fakeServer.requests.length).toEqual(1);
+		});
 	});
 	describe('Download Url', function() {
 		it('returns correct download URL for single files', function() {
-			expect(FileList.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=some%20file.txt');
-			expect(FileList.getDownloadUrl('some file.txt', '/anotherpath/abc')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fanotherpath%2Fabc&files=some%20file.txt');
+			expect(Files.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=some%20file.txt');
+			expect(Files.getDownloadUrl('some file.txt', '/anotherpath/abc')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fanotherpath%2Fabc&files=some%20file.txt');
 			$('#dir').val('/');
-			expect(FileList.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=some%20file.txt');
+			expect(Files.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=some%20file.txt');
 		});
 		it('returns correct download URL for multiple files', function() {
-			expect(FileList.getDownloadUrl(['a b c.txt', 'd e f.txt'])).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=%5B%22a%20b%20c.txt%22%2C%22d%20e%20f.txt%22%5D');
+			expect(Files.getDownloadUrl(['a b c.txt', 'd e f.txt'])).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=%5B%22a%20b%20c.txt%22%2C%22d%20e%20f.txt%22%5D');
+		});
+		it('returns the correct ajax URL', function() {
+			expect(Files.getAjaxUrl('test', {a:1, b:'x y'})).toEqual(OC.webroot + '/index.php/apps/files/ajax/test.php?a=1&b=x%20y');
 		});
 	});
 });
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index ab47de828b9..15a09a29f51 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. 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>
+	<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/ast.php b/apps/files_encryption/l10n/ast.php
new file mode 100644
index 00000000000..7e08e073095
--- /dev/null
+++ b/apps/files_encryption/l10n/ast.php
@@ -0,0 +1,13 @@
+<?php
+$TRANSLATIONS = array(
+"Password successfully changed." => "Contraseña camudada esitosamente.",
+"Could not change the password. Maybe the old password was not correct." => "Nun pue camudase la contraseña. Quiciabes la contraseña vieya nun fore correuta.",
+"personal settings" => "axustes personales",
+"Encryption" => "Cifráu",
+"Enabled" => "Habilitáu",
+"Disabled" => "Deshabilitáu",
+"Change Password" => "Camudar conseña",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la to contraseña vieya pues entrugar al to alministrador pa recuperar los tos ficheros.",
+"Could not update file recovery" => "Nun pue anovase'l ficheru de recuperación"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 18848978a8a..cdeaf5b192b 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "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.",
+"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/el.php b/apps/files_encryption/l10n/el.php
index ad8617bc6d2..972d7d7138c 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Παρακαλώ επιβεβαιώστε ότι η PHP 5.3.3  ή νεότερη είναι εγκατεστημένη  και ότι το  OpenSSL μαζί με το PHP extension είναι ενεργοποιήμένο και έχει ρυθμιστεί σωστά. Προς το παρόν, η εφαρμογή κρυπτογράφησης είναι απενεργοποιημένη.",
 "Following users are not set up for encryption:" => "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:",
 "Initial encryption started... This can take some time. Please wait." => "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.",
+"Initial encryption running... Please try again later." => "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα.",
 "Go directly to your " => "Πηγαίνε απευθείας στο ",
 "personal settings" => "προσωπικές ρυθμίσεις",
 "Encryption" => "Κρυπτογράφηση",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index dcf035289fa..f82f9df9279 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "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.",
+"Initial encryption running... Please try again later." => "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.",
 "Go directly to your " => "Liigu otse oma",
 "personal settings" => "isiklikes seadetes",
 "Encryption" => "Krüpteerimine",
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index a80c8d6f36d..22c1fa989bd 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "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.",
+"Initial encryption running... Please try again later." => "Kezedeti titkosítás fut... Próbálja később.",
 "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/ru.php b/apps/files_encryption/l10n/ru.php
index bce245ce680..ba984868932 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
 "Following users are not set up for encryption:" => "Для следующих пользователей шифрование не настроено:",
 "Initial encryption started... This can take some time. Please wait." => "Начато начальное шифрование... Это может занять какое-то время. Пожалуйста, подождите.",
+"Initial encryption running... Please try again later." => "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже.",
 "Go directly to your " => "Перейти прямо в",
 "personal settings" => "персональные настройки",
 "Encryption" => "Шифрование",
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 90a9bd73a6f..b17740f2541 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -15,6 +15,8 @@ $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:",
+"Initial encryption started... This can take some time. Please wait." => "Initiala krypteringen har påbörjats... Detta kan ta lite tid. Var god vänta.",
+"Initial encryption running... Please try again later." => "Initiala krypteringen körs... Var god försök igen senare.",
 "Go directly to your " => "Gå direkt till din",
 "personal settings" => "personliga inställningar",
 "Encryption" => "Kryptering",
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index ef3775875f0..8cbbe8a45a6 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 b7e1599c1fe..ae2d8d63e23 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -3,9 +3,10 @@
 /**
  * ownCloud
  *
- * @author Sam Tuke, Robin Appelman
- * @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman
- * icewind1991@gmail.com
+ * @author Bjoern Schiessle, Sam Tuke, Robin Appelman
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>
+ *            2012 Robin Appelman <icewind1991@gmail.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,37 +37,40 @@ namespace OCA\Encryption;
  */
 class Proxy extends \OC_FileProxy {
 
-	private static $blackList = null; //mimetypes blacklisted from encryption
 	private static $unencryptedSizes = array(); // remember unencrypted size
 	private static $fopenMode = array(); // remember the fopen mode
+	private static $enableEncryption = false; // Enable encryption for the given path
 
 	/**
 	 * Check if a file requires encryption
 	 * @param string $path
+	 * @param string $mode type of access
 	 * @return bool
 	 *
-	 * Tests if server side encryption is enabled, and file is allowed by blacklists
+	 * Tests if server side encryption is enabled, and if we should call the
+	 * crypt stream wrapper for the given file
 	 */
-	private static function shouldEncrypt($path) {
+	private static function shouldEncrypt($path, $mode = 'w') {
 
 		$userId = Helper::getUser($path);
 
-		if (\OCP\App::isEnabled('files_encryption') === false || Crypt::mode() !== 'server' ||
-				strpos($path, '/' . $userId . '/files') !== 0) {
+		// don't call the crypt stream wrapper, if...
+		if (
+				\OCP\App::isEnabled('files_encryption') === false // encryption is disabled
+				|| Crypt::mode() !== 'server'   // we are not in server-side-encryption mode
+				|| strpos($path, '/' . $userId . '/files') !== 0 // path is not in files/
+				|| substr($path, 0, 8) === 'crypt://' // we are already in crypt mode
+		) {
 			return false;
 		}
 
-		if (is_null(self::$blackList)) {
-			self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
-		}
-
-		if (Crypt::isCatfileContent($path)) {
-			return true;
-		}
-
-		$extension = substr($path, strrpos($path, '.') + 1);
+		$view = new \OC_FilesystemView('');
+		$util = new Util($view, $userId);
 
-		if (array_search($extension, self::$blackList) === false) {
+		// for write operation we always encrypt the files, for read operations
+		// we check if the existing file is encrypted or not decide if it needs to
+		// decrypt it.
+		if (($mode !== 'r' && $mode !== 'rb') || $util->isEncryptedPath($path)) {
 			return true;
 		}
 
@@ -128,6 +132,8 @@ class Proxy extends \OC_FileProxy {
 
 					// re-enable proxy - our work is done
 					\OC_FileProxy::$enabled = $proxyStatus;
+				} else {
+					return false;
 				}
 			}
 		}
@@ -205,22 +211,15 @@ class Proxy extends \OC_FileProxy {
 	}
 
 	/**
-	 * @param $path
-	 * @return bool
-	 */
-	public function postTouch($path) {
-		$this->handleFile($path);
-
-		return true;
-	}
-
-	/**
 	 * @brief remember initial fopen mode because sometimes it gets changed during the request
 	 * @param string $path path
 	 * @param string $mode type of access
 	 */
 	public function preFopen($path, $mode) {
+
 		self::$fopenMode[$path] = $mode;
+		self::$enableEncryption = self::shouldEncrypt($path, $mode);
+
 	}
 
 
@@ -233,26 +232,14 @@ class Proxy extends \OC_FileProxy {
 
 		$path = \OC\Files\Filesystem::normalizePath($path);
 
-		if (!$result) {
+		if (!$result || self::$enableEncryption === false) {
 
 			return $result;
 
 		}
 
-		// split the path parts
-		$pathParts = explode('/', $path);
-
-		// don't try to encrypt/decrypt cache chunks or files in the trash bin
-		if (isset($pathParts[2]) && ($pathParts[2] === 'cache' || $pathParts[2] === 'files_trashbin')) {
-			return $result;
-		}
-
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
 		// if we remember the mode from the pre proxy we re-use it
-		// oterwise we fall back to stream_get_meta_data()
+		// otherwise we fall back to stream_get_meta_data()
 		if (isset(self::$fopenMode[$path])) {
 			$mode = self::$fopenMode[$path];
 			unset(self::$fopenMode[$path]);
@@ -261,35 +248,12 @@ class Proxy extends \OC_FileProxy {
 			$mode = $meta['mode'];
 		}
 
-		$view = new \OC_FilesystemView('');
-
-		$userId = Helper::getUser($path);
-		$util = new Util($view, $userId);
-
-		// If file is already encrypted, decrypt using crypto protocol
-		if (
-			Crypt::mode() === 'server'
-			&& $util->isEncryptedPath($path)
-		) {
-
-			// Close the original encrypted file
-			fclose($result);
+		// Close the original encrypted file
+		fclose($result);
 
-			// Open the file using the crypto stream wrapper
-			// protocol and let it do the decryption work instead
-			$result = fopen('crypt://' . $path, $mode);
-
-		} elseif (
-				self::shouldEncrypt($path)
-				and $mode !== 'r'
-				and $mode !== 'rb'
-
-		) {
-			$result = fopen('crypt://' . $path, $mode);
-		}
-
-		// Re-enable the proxy
-		\OC_FileProxy::$enabled = $proxyStatus;
+		// Open the file using the crypto stream wrapper
+		// protocol and let it do the decryption work instead
+		$result = fopen('crypt://' . $path, $mode);
 
 		return $result;
 
@@ -344,7 +308,7 @@ class Proxy extends \OC_FileProxy {
 			\OC_FileProxy::$enabled = false;
 			$fileInfo = $view->getFileInfo($path);
 			\OC_FileProxy::$enabled = $proxyState;
-			if ($fileInfo['unencrypted_size'] > 0) {
+			if (isset($fileInfo['unencrypted_size']) && $fileInfo['unencrypted_size'] > 0) {
 				return $fileInfo['unencrypted_size'];
 			}
 			return $size;
@@ -402,39 +366,4 @@ class Proxy extends \OC_FileProxy {
 		return $size;
 	}
 
-	/**
-	 * @param $path
-	 */
-	public function handleFile($path) {
-
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		$view = new \OC_FilesystemView('/');
-		$session = new \OCA\Encryption\Session($view);
-		$userId = Helper::getUser($path);
-		$util = new Util($view, $userId);
-
-		// split the path parts
-		$pathParts = explode('/', $path);
-
-		// get relative path
-		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
-
-		// only if file is on 'files' folder fix file size and sharing
-		if (isset($pathParts[2]) && $pathParts[2] === 'files' && $util->fixFileSize($path)) {
-
-			// get sharing app state
-			$sharingEnabled = \OCP\Share::isEnabled();
-
-			// get users
-			$usersSharing = $util->getSharingUsersArray($sharingEnabled, $relativePath);
-
-			// update sharing-keys
-			$util->setSharedFileKeyfiles($session, $usersSharing, $relativePath);
-		}
-
-		\OC_FileProxy::$enabled = $proxyStatus;
-	}
 }
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 58ac03373a7..df5de558867 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -545,7 +545,7 @@ class Stream {
 				$util = new Util($this->rootView, $this->userId);
 
 				// Get all users sharing the file includes current user
-				$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
+				$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath);
 				$checkedUserIds = $util->filterShareReadyUsers($uniqueUserIds);
 
 				// Fetch public keys for all sharing users
@@ -568,21 +568,25 @@ class Stream {
 			// part file.
 			$path = Helper::stripPartialFileExtension($this->rawPath);
 
-			// get file info
-			$fileInfo = $this->rootView->getFileInfo($path);
-			if ($fileInfo) {
-				// set encryption data
-				$fileInfo['encrypted'] = true;
-				$fileInfo['size'] = $this->size;
-				$fileInfo['unencrypted_size'] = $this->unencryptedSize;
+			$fileInfo = array(
+				'encrypted' => true,
+				'size' => $this->size,
+				'unencrypted_size' => $this->unencryptedSize,
+			);
 
-				// set fileinfo
-				$this->rootView->putFileInfo($path, $fileInfo);
-			}
+			// set fileinfo
+			$this->rootView->putFileInfo($path, $fileInfo);
+
+		}
 
+		$result = fclose($this->handle);
+
+		if ($result === false) {
+			\OCP\Util::writeLog('Encryption library', 'Could not close stream, file could be corrupted', \OCP\Util::FATAL);
 		}
 
-		return fclose($this->handle);
+		return $result;
+
 	}
 
 }
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 3db5a423478..b86815021a8 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -432,25 +432,28 @@ class Util {
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		// we only need 24 byte from the last chunk
 		$data = '';
-		$handle = $this->view->fopen($path, 'r');
-		if (is_resource($handle)) {
-			// suppress fseek warining, we handle the case that fseek doesn't
-			// work in the else branch
-			if (@fseek($handle, -24, SEEK_END) === 0) {
-				$data = fgets($handle);
-			} else {
-				// if fseek failed on the storage we create a local copy from the file
-				// and read this one
-				fclose($handle);
-				$localFile = $this->view->getLocalFile($path);
-				$handle = fopen($localFile, 'r');
-				if (is_resource($handle) && fseek($handle, -24, SEEK_END) === 0) {
+
+		// we only need 24 byte from the last chunk
+		if ($this->view->file_exists($path)) {
+			$handle = $this->view->fopen($path, 'r');
+			if (is_resource($handle)) {
+				// suppress fseek warining, we handle the case that fseek doesn't
+				// work in the else branch
+				if (@fseek($handle, -24, SEEK_END) === 0) {
 					$data = fgets($handle);
+				} else {
+					// if fseek failed on the storage we create a local copy from the file
+					// and read this one
+					fclose($handle);
+					$localFile = $this->view->getLocalFile($path);
+					$handle = fopen($localFile, 'r');
+					if (is_resource($handle) && fseek($handle, -24, SEEK_END) === 0) {
+						$data = fgets($handle);
+					}
 				}
+				fclose($handle);
 			}
-			fclose($handle);
 		}
 
 		// re-enable proxy
@@ -1124,8 +1127,9 @@ class Util {
 	 * @brief Find, sanitise and format users sharing a file
 	 * @note This wraps other methods into a portable bundle
 	 * @param boolean $sharingEnabled
+	 * @param string $filePath path relativ to current users files folder
 	 */
-	public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false) {
+	public function getSharingUsersArray($sharingEnabled, $filePath) {
 
 		$appConfig = \OC::$server->getAppConfig();
 
@@ -1144,12 +1148,14 @@ class Util {
 
 		$ownerPath = \OCA\Encryption\Helper::stripPartialFileExtension($ownerPath);
 
-		$userIds = array();
+		// always add owner to the list of users with access to the file
+		$userIds = array($owner);
+
 		if ($sharingEnabled) {
 
 			// Find out who, if anyone, is sharing the file
-			$result = \OCP\Share::getUsersSharingFile($ownerPath, $owner, true);
-			$userIds = $result['users'];
+			$result = \OCP\Share::getUsersSharingFile($ownerPath, $owner);
+			$userIds = \array_merge($userIds, $result['users']);
 			if ($result['public']) {
 				$userIds[] = $this->publicShareKeyId;
 			}
@@ -1165,11 +1171,6 @@ class Util {
 			$userIds[] = $recoveryKeyId;
 		}
 
-		// add current user if given
-		if ($currentUserId !== false) {
-			$userIds[] = $currentUserId;
-		}
-
 		// check if it is a group mount
 		if (\OCP\App::isEnabled("files_external")) {
 			$mount = \OC_Mount_Config::getSystemMountPoints();
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index 231a68b6a58..cf676c445ce 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -1,63 +1,60 @@
-<form id="encryption">
-	<fieldset class="personalblock">
+<form id="encryption" class="section">
+	<h2><?php p($l->t('Encryption')); ?></h2>
 
-		<h2><?php p($l->t('Encryption')); ?></h2>
+	<p>
+		<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
+		<br/>
+		<br/>
+		<input type="password" name="encryptionRecoveryPassword" id="encryptionRecoveryPassword"/>
+		<label for="recoveryPassword"><?php p($l->t("Recovery key password")); ?></label>
+		<br/>
+		<input type="password" name="encryptionRecoveryPassword" id="repeatEncryptionRecoveryPassword"/>
+		<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat Recovery key password")); ?></label>
+		<br/>
+		<input
+			type='radio'
+			name='adminEnableRecovery'
+			value='1'
+			<?php echo($_["recoveryEnabled"] === '1' ? 'checked="checked"' : 'disabled'); ?> />
+		<?php p($l->t("Enabled")); ?>
+		<br/>
 
-		<p>
-			<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
-			<br/>
-			<br/>
-			<input type="password" name="encryptionRecoveryPassword" id="encryptionRecoveryPassword"/>
-			<label for="recoveryPassword"><?php p($l->t("Recovery key password")); ?></label>
-			<br/>
-			<input type="password" name="encryptionRecoveryPassword" id="repeatEncryptionRecoveryPassword"/>
-			<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat Recovery key password")); ?></label>
-			<br/>
-			<input
-				type='radio'
-				name='adminEnableRecovery'
-				value='1'
-				<?php echo($_["recoveryEnabled"] === '1' ? 'checked="checked"' : 'disabled'); ?> />
-			<?php p($l->t("Enabled")); ?>
-			<br/>
+		<input
+			type='radio'
+			name='adminEnableRecovery'
+			value='0'
+			<?php echo($_["recoveryEnabled"] === '0' ? 'checked="checked"' : 'disabled'); ?> />
+		<?php p($l->t("Disabled")); ?>
+	</p>
+	<br/><br/>
 
-			<input
-				type='radio'
-				name='adminEnableRecovery'
-				value='0'
-				<?php echo($_["recoveryEnabled"] === '0' ? 'checked="checked"' : 'disabled'); ?> />
-			<?php p($l->t("Disabled")); ?>
-		</p>
+	<p name="changeRecoveryPasswordBlock" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
+		<strong><?php p($l->t("Change recovery key password:")); ?></strong>
 		<br/><br/>
-
-		<p name="changeRecoveryPasswordBlock" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
-			<strong><?php p($l->t("Change recovery key password:")); ?></strong>
-			<br/><br/>
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="oldEncryptionRecoveryPassword"
-			<label for="oldEncryptionRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
-			<br/>
-			<br/>
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="newEncryptionRecoveryPassword"
-			<label for="newEncryptionRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
-			<br/>
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="repeatedNewEncryptionRecoveryPassword"
-			<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat New Recovery key password")); ?></label>
-			<br/>
-			<button
-				type="button"
-				name="submitChangeRecoveryKey"
-				disabled><?php p($l->t("Change Password")); ?>
-			</button>
-			<span class="msg"></span>
-		</p>
-	</fieldset>
+		<input
+			type="password"
+			name="changeRecoveryPassword"
+			id="oldEncryptionRecoveryPassword"
+		<label for="oldEncryptionRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
+		<br/>
+		<br/>
+		<input
+			type="password"
+			name="changeRecoveryPassword"
+			id="newEncryptionRecoveryPassword"
+		<label for="newEncryptionRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
+		<br/>
+		<input
+			type="password"
+			name="changeRecoveryPassword"
+			id="repeatedNewEncryptionRecoveryPassword"
+		<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat New Recovery key password")); ?></label>
+		<br/>
+		<button
+			type="button"
+			name="submitChangeRecoveryKey"
+			disabled><?php p($l->t("Change Password")); ?>
+		</button>
+		<span class="msg"></span>
+	</p>
 </form>
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 1b4239d82cd..8139ece1950 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,66 +1,63 @@
-<form id="encryption">

-	<fieldset class="personalblock">

-		<h2><?php p( $l->t( 'Encryption' ) ); ?></h2>

+<form id="encryption" class="section">

+	<h2><?php p( $l->t( 'Encryption' ) ); ?></h2>

 

-		<?php if ( $_["initialized"] === '1' ): ?>

-			<p>

-				<a name="changePKPasswd" />

-				<label for="changePrivateKeyPasswd">

-					<?php p( $l->t( "Your private key password no longer match your log-in password:" ) ); ?>

-				</label>

-				<br />

-				<em><?php p( $l->t( "Set your old private key password to your current log-in password." ) ); ?>

-				<?php if (  $_["recoveryEnabledForUser"] ):

-						p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );

-				endif; ?>

-				</em>

-				<br />

-				<input

-					type="password"

-					name="changePrivateKeyPassword"

-					id="oldPrivateKeyPassword" />

-				<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>

-				<br />

-				<input

-					type="password"

-					name="changePrivateKeyPassword"

-					id="newPrivateKeyPassword" />

-				<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>

-				<br />

-				<button

-					type="button"

-					name="submitChangePrivateKeyPassword"

-					disabled><?php p($l->t( "Update Private Key Password" )); ?>

-				</button>

-				<span class="msg"></span>

-			</p>

-		<?php endif; ?>

-

-		<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>

+	<?php if ( $_["initialized"] === '1' ): ?>

+		<p>

+			<a name="changePKPasswd" />

+			<label for="changePrivateKeyPasswd">

+				<?php p( $l->t( "Your private key password no longer match your log-in password:" ) ); ?>

+			</label>

+			<br />

+			<em><?php p( $l->t( "Set your old private key password to your current log-in password." ) ); ?>

+			<?php if (  $_["recoveryEnabledForUser"] ):

+					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );

+			endif; ?>

+			</em>

+			<br />

+			<input

+				type="password"

+				name="changePrivateKeyPassword"

+				id="oldPrivateKeyPassword" />

+			<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>

+			<br />

+			<input

+				type="password"

+				name="changePrivateKeyPassword"

+				id="newPrivateKeyPassword" />

+			<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>

 			<br />

-			<p>

-				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>

-				<br />

-				<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>

-				<br />

-				<input

-				type='radio'

-				name='userEnableRecovery'

-				value='1'

-				<?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />

-				<?php p( $l->t( "Enabled" ) ); ?>

-				<br />

+			<button

+				type="button"

+				name="submitChangePrivateKeyPassword"

+				disabled><?php p($l->t( "Update Private Key Password" )); ?>

+			</button>

+			<span class="msg"></span>

+		</p>

+	<?php endif; ?>

 

-				<input

-				type='radio'

-				name='userEnableRecovery'

-				value='0'

-				<?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />

-				<?php p( $l->t( "Disabled" ) ); ?>

-				<div id="recoveryEnabledSuccess"><?php p( $l->t( 'File recovery settings updated' ) ); ?></div>

-				<div id="recoveryEnabledError"><?php p( $l->t( 'Could not update file recovery' ) ); ?></div>

-			</p>

-		<?php endif; ?>

+	<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>

+		<br />

+		<p>

+			<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>

+			<br />

+			<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>

+			<br />

+			<input

+			type='radio'

+			name='userEnableRecovery'

+			value='1'

+			<?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />

+			<?php p( $l->t( "Enabled" ) ); ?>

+			<br />

 

-	</fieldset>

+			<input

+			type='radio'

+			name='userEnableRecovery'

+			value='0'

+			<?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />

+			<?php p( $l->t( "Disabled" ) ); ?>

+			<div id="recoveryEnabledSuccess"><?php p( $l->t( 'File recovery settings updated' ) ); ?></div>

+			<div id="recoveryEnabledError"><?php p( $l->t( 'Could not update file recovery' ) ); ?></div>

+		</p>

+	<?php endif; ?>

 </form>

diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index be56968ac09..1f57d7cb635 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -100,11 +100,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 		$this->filename = 'share-tmp.test';
 
-		// we don't want to tests with app files_trashbin enabled
-		\OC_App::disable('files_trashbin');
-
 		// remember files_trashbin state
 		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+		// we don't want to tests with app files_trashbin enabled
+		\OC_App::disable('files_trashbin');
 	}
 
 	function tearDown() {
diff --git a/apps/files_external/3rdparty/phpseclib/LICENSE b/apps/files_external/3rdparty/phpseclib/LICENSE
index 6ecd9b9bec1..75f6b2045c5 100644
--- a/apps/files_external/3rdparty/phpseclib/LICENSE
+++ b/apps/files_external/3rdparty/phpseclib/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2007-2012 TerraFrost and other contributors
+Copyright 2007-2013 TerraFrost and other contributors
 http://phpseclib.sourceforge.net/
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -18,4 +18,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/apps/files_external/3rdparty/phpseclib/README.md b/apps/files_external/3rdparty/phpseclib/README.md
index e90b12f4a6d..de528231662 100644
--- a/apps/files_external/3rdparty/phpseclib/README.md
+++ b/apps/files_external/3rdparty/phpseclib/README.md
@@ -6,11 +6,11 @@ MIT-licensed pure-PHP implementations of an arbitrary-precision integer
 arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
 AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 
-* [Download (0.3.5)](http://sourceforge.net/projects/phpseclib/files/phpseclib0.3.5.zip/download)
+* [Download (0.3.6)](http://sourceforge.net/projects/phpseclib/files/phpseclib0.3.6.zip/download)
 * [Browse Git](https://github.com/phpseclib/phpseclib)
 * [Documentation](http://phpseclib.sourceforge.net/)
 * [Support](http://www.frostjedi.com/phpbb/viewforum.php?f=46)
-* [Code Coverage Report](http://phpseclib.bantux.org/code_coverage/latest/)
+* [Code Coverage Report](http://phpseclib.bantux.org/code_coverage/master/latest/)
 
 <img src="http://phpseclib.sourceforge.net/pear-icon.png" alt="PEAR Channel" width="16" height="16">
 PEAR Channel: [phpseclib.sourceforge.net](http://phpseclib.sourceforge.net/pear.htm)
diff --git a/apps/files_external/3rdparty/phpseclib/composer.json b/apps/files_external/3rdparty/phpseclib/composer.json
index 79c92b52e47..70f4f7c36e9 100644
--- a/apps/files_external/3rdparty/phpseclib/composer.json
+++ b/apps/files_external/3rdparty/phpseclib/composer.json
@@ -11,6 +11,8 @@
         "signing",
         "rsa",
         "aes",
+        "blowfish",
+        "twofish",
         "ssh",
         "sftp",
         "x509",
@@ -25,16 +27,34 @@
         {
             "name": "Jim Wigginton",
             "email": "terrafrost@php.net",
+            "role": "Lead Developer"
+        },
+        {
+            "name": "Patrick Monnerat",
+            "email": "pm@datasphere.ch",
+            "role": "Developer"
+        },
+        {
+            "name": "Andreas Fischer",
+            "email": "bantu@phpbb.com",
+            "role": "Developer"
+        },
+        {
+            "name": "Hans-Jürgen Petrich",
+            "email": "petrich@tronic-media.com",
             "role": "Developer"
         }
     ],
     "require": {
         "php": ">=5.0.0"
     },
+    "require-dev": {
+        "squizlabs/php_codesniffer": "1.*"
+    },
     "suggest": {
         "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.",
         "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
-        "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP >= 4.3.3." 
+        "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 4.3.3."
     },
     "include-path": ["phpseclib/"],
     "autoload": {
@@ -42,7 +62,8 @@
             "Crypt": "phpseclib/",
             "File": "phpseclib/",
             "Math": "phpseclib/",
-            "Net": "phpseclib/"
+            "Net": "phpseclib/",
+            "System": "phpseclib/"
         },
         "files": [
             "phpseclib/Crypt/Random.php"
diff --git a/apps/files_external/3rdparty/phpseclib/composer.lock b/apps/files_external/3rdparty/phpseclib/composer.lock
new file mode 100644
index 00000000000..1b5ff07e484
--- /dev/null
+++ b/apps/files_external/3rdparty/phpseclib/composer.lock
@@ -0,0 +1,95 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+    ],
+    "hash": "4975b8cde04a99d6e78e108753845af6",
+    "packages": [
+
+    ],
+    "packages-dev": [
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "a76a39b317ce8106abe6264daa505e24e1731860"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a76a39b317ce8106abe6264daa505e24e1731860",
+                "reference": "a76a39b317ce8106abe6264daa505e24e1731860",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.1.2"
+            },
+            "suggest": {
+                "phpunit/php-timer": "dev-master"
+            },
+            "bin": [
+                "scripts/phpcs"
+            ],
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/CommentParser/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2014-02-04 23:49:58"
+        }
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": [
+
+    ],
+    "platform": {
+        "php": ">=5.0.0"
+    },
+    "platform-dev": [
+
+    ]
+}
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/AES.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/AES.php
index 81fa2feab66..cf8c050a59e 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/AES.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/AES.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of AES.
@@ -54,19 +53,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_AES
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVIII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_AES
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVIII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
  * Include Crypt_Rijndael
  */
 if (!class_exists('Crypt_Rijndael')) {
-    require_once('Rijndael.php');
+    include_once 'Rijndael.php';
 }
 
 /**#@+
@@ -125,12 +124,13 @@ define('CRYPT_AES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
 /**
  * Pure-PHP implementation of AES.
  *
+ * @package Crypt_AES
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Crypt_AES
  */
-class Crypt_AES extends Crypt_Rijndael {
+class Crypt_AES extends Crypt_Rijndael
+{
     /**
      * The namespace used by the cipher for its constants.
      *
@@ -183,6 +183,3 @@ class Crypt_AES extends Crypt_Rijndael {
         return;
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Base.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Base.php
index 7c650ca729b..f08529b902b 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Base.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Base.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Base Class for all Crypt_* cipher classes
@@ -44,14 +43,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_Base
- * @author     Jim Wigginton <terrafrost@php.net>
- * @author     Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version    1.0.1
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_Base
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version   1.0.1
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**#@+
@@ -115,13 +114,14 @@ define('CRYPT_MODE_MCRYPT', 2);
 /**
  * Base Class for all Crypt_* cipher classes
  *
+ * @package Crypt_Base
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
  * @version 1.0.0
  * @access  public
- * @package Crypt_Base
  */
-class Crypt_Base {
+class Crypt_Base
+{
     /**
      * The Encryption Mode
      *
@@ -582,7 +582,7 @@ class Crypt_Base {
                     case !function_exists('hash_algos'):
                     case !in_array($hash, hash_algos()):
                         if (!class_exists('Crypt_Hash')) {
-                            require_once('Crypt/Hash.php');
+                            include_once 'Crypt/Hash.php';
                         }
                         $i = 1;
                         while (strlen($key) < $dkLen) {
@@ -1984,6 +1984,3 @@ class Crypt_Base {
         return $functions;
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Blowfish.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Blowfish.php
index c8ef67e8f7c..b352e7c4688 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Blowfish.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Blowfish.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of Blowfish.
@@ -45,14 +44,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_Blowfish
- * @author     Jim Wigginton <terrafrost@php.net>
- * @author     Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version    1.0
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_Blowfish
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version   1.0
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
@@ -61,7 +60,7 @@
  * Base cipher class
  */
 if (!class_exists('Crypt_Base')) {
-    require_once('Base.php');
+    include_once 'Base.php';
 }
 
 /**#@+
@@ -120,13 +119,14 @@ define('CRYPT_BLOWFISH_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
 /**
  * Pure-PHP implementation of Blowfish.
  *
+ * @package Crypt_Blowfish
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
  * @version 1.0
  * @access  public
- * @package Crypt_Blowfish
  */
-class Crypt_Blowfish extends Crypt_Base {
+class Crypt_Blowfish extends Crypt_Base
+{
     /**
      * Block Length of the cipher
      *
@@ -418,8 +418,7 @@ class Crypt_Blowfish extends Crypt_Base {
 
         if (!$keylength) {
             $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-        }
-        elseif ($keylength > 56) {
+        } elseif ($keylength > 56) {
             $key = substr($key, 0, 56);
         }
 
@@ -673,6 +672,3 @@ class Crypt_Blowfish extends Crypt_Base {
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/DES.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/DES.php
index 8b04210659d..fcbf01993a1 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/DES.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/DES.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of DES.
@@ -51,12 +50,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_DES
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_DES
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
@@ -65,7 +64,7 @@
  * Base cipher class
  */
 if (!class_exists('Crypt_Base')) {
-    require_once('Base.php');
+    include_once 'Base.php';
 }
 
 /**#@+
@@ -139,12 +138,13 @@ define('CRYPT_DES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
 /**
  * Pure-PHP implementation of DES.
  *
+ * @package Crypt_DES
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Crypt_DES
  */
-class Crypt_DES extends Crypt_Base {
+class Crypt_DES extends Crypt_Base
+{
     /**
      * Block Length of the cipher
      *
@@ -1336,12 +1336,14 @@ class Crypt_DES extends Crypt_Base {
                       $pc2mapd3[($d >>  8) & 0xFF] | $pc2mapd4[ $d        & 0xFF];
 
                 // Reorder: odd bytes/even bytes. Push the result in key schedule.
-                $keys[$des_round][CRYPT_DES_ENCRYPT][       ] =
-                $keys[$des_round][CRYPT_DES_DECRYPT][$ki - 1] = ( $cp        & 0xFF000000) | (($cp <<  8) & 0x00FF0000) |
-                                                                (($dp >> 16) & 0x0000FF00) | (($dp >>  8) & 0x000000FF);
-                $keys[$des_round][CRYPT_DES_ENCRYPT][       ] =
-                $keys[$des_round][CRYPT_DES_DECRYPT][$ki    ] = (($cp <<  8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
-                                                                (($dp >>  8) & 0x0000FF00) | ( $dp        & 0x000000FF);
+                $val1 = ( $cp        & 0xFF000000) | (($cp <<  8) & 0x00FF0000) |
+                        (($dp >> 16) & 0x0000FF00) | (($dp >>  8) & 0x000000FF);
+                $val2 = (($cp <<  8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
+                        (($dp >>  8) & 0x0000FF00) | ( $dp        & 0x000000FF);
+                $keys[$des_round][CRYPT_DES_ENCRYPT][       ] = $val1;
+                $keys[$des_round][CRYPT_DES_DECRYPT][$ki - 1] = $val1;
+                $keys[$des_round][CRYPT_DES_ENCRYPT][       ] = $val2;
+                $keys[$des_round][CRYPT_DES_DECRYPT][$ki    ] = $val2;
             }
         }
 
@@ -1531,6 +1533,3 @@ class Crypt_DES extends Crypt_Base {
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Hash.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Hash.php
index 21897241989..b156169d68b 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Hash.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Hash.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
@@ -13,7 +12,7 @@
  *
  * PHP versions 4 and 5
  *
- * {@internal The variable names are the same as those in 
+ * {@internal The variable names are the same as those in
  * {@link http://tools.ietf.org/html/rfc2104#section-2 RFC2104}.}}
  *
  * Here's a short example of how to use this library:
@@ -35,10 +34,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -47,12 +46,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_Hash
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_Hash
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**#@+
@@ -76,12 +75,13 @@ define('CRYPT_HASH_MODE_HASH',     3);
 /**
  * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
  *
+ * @package Crypt_Hash
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Crypt_Hash
  */
-class Crypt_Hash {
+class Crypt_Hash
+{
     /**
      * Hash Parameter
      *
@@ -581,7 +581,7 @@ class Crypt_Hash {
     function _sha512($m)
     {
         if (!class_exists('Math_BigInteger')) {
-            require_once('Math/BigInteger.php');
+            include_once 'Math/BigInteger.php';
         }
 
         static $init384, $init512, $k;
@@ -589,11 +589,11 @@ class Crypt_Hash {
         if (!isset($k)) {
             // Initialize variables
             $init384 = array( // initial values for SHA384
-                'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939', 
+                'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939',
                 '67332667ffc00b31', '8eb44a8768581511', 'db0c2e0d64f98fa7', '47b5481dbefa4fa4'
             );
             $init512 = array( // initial values for SHA512
-                '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1', 
+                '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1',
                 '510e527fade682d1', '9b05688c2b3e6c1f', '1f83d9abfb41bd6b', '5be0cd19137e2179'
             );
 
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RC2.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RC2.php
index 5e0ca88c8fc..de22d631a16 100755
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RC2.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RC2.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of RC2.
@@ -45,11 +44,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_RC2
- * @author     Patrick Monnerat <pm@datasphere.ch>
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category Crypt
+ * @package  Crypt_RC2
+ * @author   Patrick Monnerat <pm@datasphere.ch>
+ * @license  http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link     http://phpseclib.sourceforge.net
  */
 
 /**
@@ -58,7 +57,7 @@
  * Base cipher class
  */
 if (!class_exists('Crypt_Base')) {
-    require_once('Base.php');
+    include_once 'Base.php';
 }
 
 /**#@+
@@ -117,11 +116,12 @@ define('CRYPT_RC2_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
 /**
  * Pure-PHP implementation of RC2.
  *
+ * @package Crypt_RC2
  * @version 0.1.1
  * @access  public
- * @package Crypt_RC2
  */
-class Crypt_RC2 extends Crypt_Base {
+class Crypt_RC2 extends Crypt_Base
+{
     /**
      * Block Length of the cipher
      *
@@ -651,6 +651,3 @@ class Crypt_RC2 extends Crypt_Base {
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RC4.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RC4.php
index f6a9eae2fb7..d062be2573f 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RC4.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RC4.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of RC4.
@@ -53,12 +52,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_RC4
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_RC4
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
@@ -67,7 +66,7 @@
  * Base cipher class
  */
 if (!class_exists('Crypt_Base')) {
-    require_once('Base.php');
+    include_once 'Base.php';
 }
 
 /**#@+
@@ -95,20 +94,21 @@ define('CRYPT_RC4_DECRYPT', 1);
 /**
  * Pure-PHP implementation of RC4.
  *
+ * @package Crypt_RC4
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Crypt_RC4
  */
-class Crypt_RC4 extends Crypt_Base {
+class Crypt_RC4 extends Crypt_Base
+{
     /**
      * Block Length of the cipher
      *
-     * RC4 is a stream cipher 
+     * RC4 is a stream cipher
      * so we the block_size to 0
      *
      * @see Crypt_Base::block_size
-     * @var Integer 
+     * @var Integer
      * @access private
      */
     var $block_size = 0;
@@ -132,7 +132,6 @@ class Crypt_RC4 extends Crypt_Base {
      */
     var $const_namespace = 'RC4';
 
-
     /**
      * The mcrypt specific name of the cipher
      *
@@ -332,6 +331,3 @@ class Crypt_RC4 extends Crypt_Base {
         return $text;
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RSA.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RSA.php
index 92ebfdf7236..feb887c7031 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RSA.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/RSA.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP PKCS#1 (v2.1) compliant implementation of RSA.
@@ -48,10 +47,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -60,12 +59,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_RSA
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMIX Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_RSA
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMIX Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
@@ -73,17 +72,17 @@
  */
 // the class_exists() will only be called if the crypt_random_string function hasn't been defined and
 // will trigger a call to __autoload() if you're wanting to auto-load classes
-// call function_exists() a second time to stop the require_once from being called outside
+// call function_exists() a second time to stop the include_once from being called outside
 // of the auto loader
 if (!function_exists('crypt_random_string')) {
-    require_once('Random.php');
+    include_once 'Random.php';
 }
 
 /**
  * Include Crypt_Hash
  */
 if (!class_exists('Crypt_Hash')) {
-    require_once('Hash.php');
+    include_once 'Hash.php';
 }
 
 /**#@+
@@ -145,7 +144,7 @@ define('CRYPT_RSA_ASN1_INTEGER',   2);
 /**
  * ASN1 Bit String
  */
-define('CRYPT_RSA_ASN1_BITSTRING', 3); 
+define('CRYPT_RSA_ASN1_BITSTRING', 3);
 /**
  * ASN1 Sequence (with the constucted bit set)
  */
@@ -240,12 +239,13 @@ define('CRYPT_RSA_PUBLIC_FORMAT_PKCS1', 7);
 /**
  * Pure-PHP PKCS#1 compliant implementation of RSA.
  *
+ * @package Crypt_RSA
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Crypt_RSA
  */
-class Crypt_RSA {
+class Crypt_RSA
+{
     /**
      * Precomputed Zero
      *
@@ -433,7 +433,7 @@ class Crypt_RSA {
     /**
      * OpenSSL configuration file name.
      *
-     * Set to NULL to use system configuration file.
+     * Set to null to use system configuration file.
      * @see Crypt_RSA::createKey()
      * @var Mixed
      * @Access public
@@ -461,7 +461,7 @@ class Crypt_RSA {
     function Crypt_RSA()
     {
         if (!class_exists('Math_BigInteger')) {
-            require_once('Math/BigInteger.php');
+            include_once 'Math/BigInteger.php';
         }
 
         $this->configFile = CRYPT_RSA_OPENSSL_CONFIG;
@@ -555,7 +555,7 @@ class Crypt_RSA {
                 $config['config'] = $this->configFile;
             }
             $rsa = openssl_pkey_new(array('private_key_bits' => $bits) + $config);
-            openssl_pkey_export($rsa, $privatekey, NULL, $config);
+            openssl_pkey_export($rsa, $privatekey, null, $config);
             $publickey = openssl_pkey_get_details($rsa);
             $publickey = $publickey['key'];
 
@@ -773,7 +773,7 @@ class Crypt_RSA {
                     $private.= crypt_random_string(16 - (strlen($private) & 15));
                     $source.= pack('Na*', strlen($private), $private);
                     if (!class_exists('Crypt_AES')) {
-                        require_once('Crypt/AES.php');
+                        include_once 'Crypt/AES.php';
                     }
                     $sequence = 0;
                     $symkey = '';
@@ -794,7 +794,7 @@ class Crypt_RSA {
                 $key.= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
                 $key.= chunk_split($private, 64);
                 if (!class_exists('Crypt_Hash')) {
-                    require_once('Crypt/Hash.php');
+                    include_once 'Crypt/Hash.php';
                 }
                 $hash = new Crypt_Hash('sha1');
                 $hash->setKey(pack('H*', sha1($hashkey)));
@@ -834,7 +834,7 @@ class Crypt_RSA {
                     $symkey = pack('H*', md5($this->password . $iv)); // symkey is short for symmetric key
                     $symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
                     if (!class_exists('Crypt_TripleDES')) {
-                        require_once('Crypt/TripleDES.php');
+                        include_once 'Crypt/TripleDES.php';
                     }
                     $des = new Crypt_TripleDES();
                     $des->setKey($symkey);
@@ -984,7 +984,7 @@ class Crypt_RSA {
                    DES-EDE3-CBC as an algorithm, however, is not discussed anywhere, near as I can tell.
                    DES-CBC and DES-EDE are discussed in RFC1423, however, DES-EDE3-CBC isn't, nor is its key derivation
                    function.  As is, the definitive authority on this encoding scheme isn't the IETF but rather OpenSSL's
-                   own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that 
+                   own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that
                    implementation are part of the standard, as well.
 
                    * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
@@ -992,41 +992,42 @@ class Crypt_RSA {
                     $iv = pack('H*', trim($matches[2]));
                     $symkey = pack('H*', md5($this->password . substr($iv, 0, 8))); // symkey is short for symmetric key
                     $symkey.= pack('H*', md5($symkey . $this->password . substr($iv, 0, 8)));
-                    $ciphertext = preg_replace('#.+(\r|\n|\r\n)\1|[\r\n]|-.+-| #s', '', $key);
-                    $ciphertext = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $ciphertext) ? base64_decode($ciphertext) : false;
+                    // remove the Proc-Type / DEK-Info sections as they're no longer needed
+                    $key = preg_replace('#^(?:Proc-Type|DEK-Info): .*#m', '', $key);
+                    $ciphertext = $this->_extractBER($key);
                     if ($ciphertext === false) {
                         $ciphertext = $key;
                     }
                     switch ($matches[1]) {
                         case 'AES-256-CBC':
                             if (!class_exists('Crypt_AES')) {
-                                require_once('Crypt/AES.php');
+                                include_once 'Crypt/AES.php';
                             }
                             $crypto = new Crypt_AES();
                             break;
                         case 'AES-128-CBC':
                             if (!class_exists('Crypt_AES')) {
-                                require_once('Crypt/AES.php');
+                                include_once 'Crypt/AES.php';
                             }
                             $symkey = substr($symkey, 0, 16);
                             $crypto = new Crypt_AES();
                             break;
                         case 'DES-EDE3-CFB':
                             if (!class_exists('Crypt_TripleDES')) {
-                                require_once('Crypt/TripleDES.php');
+                                include_once 'Crypt/TripleDES.php';
                             }
                             $crypto = new Crypt_TripleDES(CRYPT_DES_MODE_CFB);
                             break;
                         case 'DES-EDE3-CBC':
                             if (!class_exists('Crypt_TripleDES')) {
-                                require_once('Crypt/TripleDES.php');
+                                include_once 'Crypt/TripleDES.php';
                             }
                             $symkey = substr($symkey, 0, 24);
                             $crypto = new Crypt_TripleDES();
                             break;
                         case 'DES-CBC':
                             if (!class_exists('Crypt_DES')) {
-                                require_once('Crypt/DES.php');
+                                include_once 'Crypt/DES.php';
                             }
                             $crypto = new Crypt_DES();
                             break;
@@ -1037,8 +1038,7 @@ class Crypt_RSA {
                     $crypto->setIV($iv);
                     $decoded = $crypto->decrypt($ciphertext);
                 } else {
-                    $decoded = preg_replace('#-.+-|[\r\n]| #', '', $key);
-                    $decoded = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $decoded) ? base64_decode($decoded) : false;
+                    $decoded = $this->_extractBER($key);
                 }
 
                 if ($decoded !== false) {
@@ -1240,7 +1240,7 @@ class Crypt_RSA {
                 switch ($encryption) {
                     case 'aes256-cbc':
                         if (!class_exists('Crypt_AES')) {
-                            require_once('Crypt/AES.php');
+                            include_once 'Crypt/AES.php';
                         }
                         $symkey = '';
                         $sequence = 0;
@@ -1452,7 +1452,7 @@ class Crypt_RSA {
                     break;
                 }
             }
-            
+
         } else {
             $components = $this->_parseKey($key, $type);
         }
@@ -2152,7 +2152,7 @@ class Crypt_RSA {
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.2 RFC3447#section-7.1.2}.  The fact that the error
      * messages aren't distinguishable from one another hinders debugging, but, to quote from RFC3447#section-7.1.2:
-     * 
+     *
      *    Note.  Care must be taken to ensure that an opponent cannot
      *    distinguish the different error conditions in Step 3.g, whether by
      *    error message or timing, or, more generally, learn partial
@@ -2781,4 +2781,31 @@ class Crypt_RSA {
                 return $this->_rsassa_pss_verify($message, $signature);
         }
     }
+
+    /**
+     * Extract raw BER from Base64 encoding
+     *
+     * @access private
+     * @param String $str
+     * @return String
+     */
+    function _extractBER($str)
+    {
+        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
+         * above and beyond the ceritificate.
+         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
+         *
+         * Bag Attributes
+         *     localKeyID: 01 00 00 00
+         * subject=/O=organization/OU=org unit/CN=common name
+         * issuer=/O=organization/CN=common name
+         */
+        $temp = preg_replace('#.*?^-+[^-]+-+#ms', '', $str, 1);
+        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
+        $temp = preg_replace('#-+[^-]+-+#', '', $temp);
+        // remove new lines
+        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
+        return $temp != false ? $temp : $str;
+    }
 }
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Random.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Random.php
index 8532aab5a59..977ec79726b 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Random.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Random.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Random Number Generator
@@ -33,12 +32,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_Random
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_Random
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
@@ -132,9 +131,7 @@ function crypt_random_string($length)
         $old_session_id = session_id();
         $old_use_cookies = ini_get('session.use_cookies');
         $old_session_cache_limiter = session_cache_limiter();
-        if (isset($_SESSION)) {
-            $_OLD_SESSION = $_SESSION;
-        }
+        $_OLD_SESSION = isset($_SESSION) ? $_SESSION : false;
         if ($old_session_id != '') {
             session_write_close();
         }
@@ -167,7 +164,7 @@ function crypt_random_string($length)
             ini_set('session.use_cookies', $old_use_cookies);
             session_cache_limiter($old_session_cache_limiter);
         } else {
-           if (isset($_OLD_SESSION)) {
+           if ($_OLD_SESSION !== false) {
                $_SESSION = $_OLD_SESSION;
                unset($_OLD_SESSION);
             } else {
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Rijndael.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Rijndael.php
index c63e0ff7e3f..42531516cf8 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Rijndael.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Rijndael.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of Rijndael.
@@ -63,12 +62,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_Rijndael
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVIII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_Rijndael
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVIII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
@@ -77,7 +76,7 @@
  * Base cipher class
  */
 if (!class_exists('Crypt_Base')) {
-    require_once('Base.php');
+    include_once 'Base.php';
 }
 
 /**#@+
@@ -136,12 +135,13 @@ define('CRYPT_RIJNDAEL_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
 /**
  * Pure-PHP implementation of Rijndael.
  *
+ * @package Crypt_Rijndael
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Crypt_Rijndael
  */
-class Crypt_Rijndael extends Crypt_Base {
+class Crypt_Rijndael extends Crypt_Base
+{
     /**
      * The default password key_size used by setPassword()
      *
@@ -1369,6 +1369,3 @@ class Crypt_Rijndael extends Crypt_Base {
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/TripleDES.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/TripleDES.php
index 4030c6c9fbe..21318209fe2 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/TripleDES.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/TripleDES.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of Triple DES.
@@ -45,19 +44,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_TripleDES
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_TripleDES
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
  * Include Crypt_DES
  */
 if (!class_exists('Crypt_DES')) {
-    require_once('DES.php');
+    include_once 'DES.php';
 }
 
 /**
@@ -77,12 +76,13 @@ define('CRYPT_DES_MODE_CBC3', CRYPT_DES_MODE_CBC);
 /**
  * Pure-PHP implementation of Triple DES.
  *
+ * @package Crypt_TripleDES
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Crypt_TripleDES
  */
-class Crypt_TripleDES extends Crypt_DES {
+class Crypt_TripleDES extends Crypt_DES
+{
     /**
      * The default password key_size used by setPassword()
      *
@@ -417,6 +417,3 @@ class Crypt_TripleDES extends Crypt_DES {
         parent::_setupKey();
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Twofish.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Twofish.php
index 6342298d1a3..9be5fd10997 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Twofish.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Crypt/Twofish.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of Twofish.
@@ -45,14 +44,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Crypt
- * @package    Crypt_Twofish
- * @author     Jim Wigginton <terrafrost@php.net>
- * @author     Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version    1.0
- * @link       http://phpseclib.sourceforge.net
+ * @category  Crypt
+ * @package   Crypt_Twofish
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version   1.0
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
@@ -61,7 +60,7 @@
  * Base cipher class
  */
 if (!class_exists('Crypt_Base')) {
-    require_once('Base.php');
+    include_once 'Base.php';
 }
 
 /**#@+
@@ -120,13 +119,14 @@ define('CRYPT_TWOFISH_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
 /**
  * Pure-PHP implementation of Twofish.
  *
+ * @package Crypt_Twofish
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
  * @version 1.0
  * @access  public
- * @package Crypt_Twofish
  */
-class Crypt_Twofish extends Crypt_Base {
+class Crypt_Twofish extends Crypt_Base
+{
     /**
      * The namespace used by the cipher for its constants.
      *
@@ -919,6 +919,3 @@ class Crypt_Twofish extends Crypt_Base {
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/File/ANSI.php b/apps/files_external/3rdparty/phpseclib/phpseclib/File/ANSI.php
index f7ac85536f8..0e0004ce27d 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/File/ANSI.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/File/ANSI.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP ANSI Decoder
@@ -17,10 +16,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,23 +28,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   File
- * @package    File_ANSI
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMXII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  File
+ * @package   File_ANSI
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMXII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
  * Pure-PHP ANSI Decoder
  *
+ * @package File_ANSI
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.3.0
  * @access  public
- * @package File_ANSI
  */
-class File_ANSI {
+class File_ANSI
+{
     /**
      * Max Width
      *
@@ -557,4 +557,4 @@ class File_ANSI {
 
         return '<pre style="color: white; background: black" width="' . ($this->max_x + 1) . '">' . $scrollback . '</pre>';
     }
-}
\ No newline at end of file
+}
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/File/ASN1.php b/apps/files_external/3rdparty/phpseclib/phpseclib/File/ASN1.php
index 9f481fc3ccb..67d1f6dc790 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/File/ASN1.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/File/ASN1.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP ASN.1 Parser
@@ -20,10 +19,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,12 +31,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   File
- * @package    File_ASN1
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMXII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  File
+ * @package   File_ASN1
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMXII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**#@+
@@ -58,21 +57,21 @@ define('FILE_ASN1_CLASS_PRIVATE',          3);
  * @access private
  * @link http://www.obj-sys.com/asn1tutorial/node124.html
  */
-define('FILE_ASN1_TYPE_BOOLEAN',          1);
-define('FILE_ASN1_TYPE_INTEGER',          2);
-define('FILE_ASN1_TYPE_BIT_STRING',       3);
-define('FILE_ASN1_TYPE_OCTET_STRING',     4);
-define('FILE_ASN1_TYPE_NULL',             5);
-define('FILE_ASN1_TYPE_OBJECT_IDENTIFIER',6);
-//define('FILE_ASN1_TYPE_OBJECT_DESCRIPTOR',7);
-//define('FILE_ASN1_TYPE_INSTANCE_OF',      8); // EXTERNAL
-define('FILE_ASN1_TYPE_REAL',             9);
-define('FILE_ASN1_TYPE_ENUMERATED',      10);
-//define('FILE_ASN1_TYPE_EMBEDDED',        11);
-define('FILE_ASN1_TYPE_UTF8_STRING',     12);
-//define('FILE_ASN1_TYPE_RELATIVE_OID',    13);
-define('FILE_ASN1_TYPE_SEQUENCE',        16); // SEQUENCE OF
-define('FILE_ASN1_TYPE_SET',             17); // SET OF
+define('FILE_ASN1_TYPE_BOOLEAN',           1);
+define('FILE_ASN1_TYPE_INTEGER',           2);
+define('FILE_ASN1_TYPE_BIT_STRING',        3);
+define('FILE_ASN1_TYPE_OCTET_STRING',      4);
+define('FILE_ASN1_TYPE_NULL',              5);
+define('FILE_ASN1_TYPE_OBJECT_IDENTIFIER', 6);
+//define('FILE_ASN1_TYPE_OBJECT_DESCRIPTOR', 7);
+//define('FILE_ASN1_TYPE_INSTANCE_OF',       8); // EXTERNAL
+define('FILE_ASN1_TYPE_REAL',              9);
+define('FILE_ASN1_TYPE_ENUMERATED',       10);
+//define('FILE_ASN1_TYPE_EMBEDDED',         11);
+define('FILE_ASN1_TYPE_UTF8_STRING',      12);
+//define('FILE_ASN1_TYPE_RELATIVE_OID',     13);
+define('FILE_ASN1_TYPE_SEQUENCE',         16); // SEQUENCE OF
+define('FILE_ASN1_TYPE_SET',              17); // SET OF
 /**#@-*/
 /**#@+
  * More Tag Classes
@@ -80,19 +79,19 @@ define('FILE_ASN1_TYPE_SET',             17); // SET OF
  * @access private
  * @link http://www.obj-sys.com/asn1tutorial/node10.html
  */
-define('FILE_ASN1_TYPE_NUMERIC_STRING',  18);
-define('FILE_ASN1_TYPE_PRINTABLE_STRING',19);
-define('FILE_ASN1_TYPE_TELETEX_STRING',  20); // T61String
-define('FILE_ASN1_TYPE_VIDEOTEX_STRING', 21);
-define('FILE_ASN1_TYPE_IA5_STRING',      22);
-define('FILE_ASN1_TYPE_UTC_TIME',        23);
-define('FILE_ASN1_TYPE_GENERALIZED_TIME',24);
-define('FILE_ASN1_TYPE_GRAPHIC_STRING',  25);
-define('FILE_ASN1_TYPE_VISIBLE_STRING',  26); // ISO646String
-define('FILE_ASN1_TYPE_GENERAL_STRING',  27);
-define('FILE_ASN1_TYPE_UNIVERSAL_STRING',28);
-//define('FILE_ASN1_TYPE_CHARACTER_STRING',29);
-define('FILE_ASN1_TYPE_BMP_STRING',      30);
+define('FILE_ASN1_TYPE_NUMERIC_STRING',   18);
+define('FILE_ASN1_TYPE_PRINTABLE_STRING', 19);
+define('FILE_ASN1_TYPE_TELETEX_STRING',   20); // T61String
+define('FILE_ASN1_TYPE_VIDEOTEX_STRING',  21);
+define('FILE_ASN1_TYPE_IA5_STRING',       22);
+define('FILE_ASN1_TYPE_UTC_TIME',         23);
+define('FILE_ASN1_TYPE_GENERALIZED_TIME', 24);
+define('FILE_ASN1_TYPE_GRAPHIC_STRING',   25);
+define('FILE_ASN1_TYPE_VISIBLE_STRING',   26); // ISO646String
+define('FILE_ASN1_TYPE_GENERAL_STRING',   27);
+define('FILE_ASN1_TYPE_UNIVERSAL_STRING', 28);
+//define('FILE_ASN1_TYPE_CHARACTER_STRING', 29);
+define('FILE_ASN1_TYPE_BMP_STRING',       30);
 /**#@-*/
 
 /**#@+
@@ -111,12 +110,13 @@ define('FILE_ASN1_TYPE_ANY',             -2);
  *
  * Bypass normal encoding rules in File_ASN1::encodeDER()
  *
+ * @package File_ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.3.0
  * @access  public
- * @package File_ASN1
  */
-class File_ASN1_Element {
+class File_ASN1_Element
+{
     /**
      * Raw element value
      *
@@ -141,12 +141,13 @@ class File_ASN1_Element {
 /**
  * Pure-PHP ASN.1 Parser
  *
+ * @package File_ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.3.0
  * @access  public
- * @package File_ASN1
  */
-class File_ASN1 {
+class File_ASN1
+{
     /**
      * ASN.1 object identifier
      *
@@ -252,7 +253,7 @@ class File_ASN1 {
         if (!$static_init) {
             $static_init = true;
             if (!class_exists('Math_BigInteger')) {
-                require_once('Math/BigInteger.php');
+                include_once 'Math/BigInteger.php';
             }
         }
     }
@@ -316,7 +317,7 @@ class File_ASN1 {
             $length = ord($this->_string_shift($encoded));
             $start++;
             if ( $length == 0x80 ) { // indefinite length
-                // "[A sender shall] use the indefinite form (see 8.1.3.6) if the encoding is constructed and is not all 
+                // "[A sender shall] use the indefinite form (see 8.1.3.6) if the encoding is constructed and is not all
                 //  immediately available." -- paragraph 8.1.3.2.c
                 //if ( !$constructed ) {
                 //    return false;
@@ -419,7 +420,7 @@ class File_ASN1 {
                             //}
                             $current['content'].= $temp[$i]['content'];
                         }
-                        // $length = 
+                        // $length =
                     }
                     break;
                 case FILE_ASN1_TYPE_NULL:
@@ -456,7 +457,7 @@ class File_ASN1 {
 
                      -- X.690-0207.pdf#page=23 (paragraph 8.21.3)
 
-                   Per that, we're not going to do any validation.  If there are any illegal characters in the string, 
+                   Per that, we're not going to do any validation.  If there are any illegal characters in the string,
                    we don't really care */
                 case FILE_ASN1_TYPE_NUMERIC_STRING:
                     // 0,1,2,3,4,5,6,7,8,9, and space
@@ -545,13 +546,13 @@ class File_ASN1 {
                         return array($key => $value);
                     }
                 }
-                return NULL;
+                return null;
             case isset($mapping['implicit']):
             case isset($mapping['explicit']):
             case $decoded['type'] == $mapping['type']:
                 break;
             default:
-                return NULL;
+                return null;
         }
 
         if (isset($mapping['implicit'])) {
@@ -566,8 +567,8 @@ class File_ASN1 {
                 if (isset($mapping['min']) && isset($mapping['max'])) {
                     $child = $mapping['children'];
                     foreach ($decoded['content'] as $content) {
-                        if (($map[] = $this->asn1map($content, $child, $special)) === NULL) {
-                            return NULL;
+                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
+                            return null;
                         }
                     }
 
@@ -585,15 +586,14 @@ class File_ASN1 {
                         if ($child['type'] != FILE_ASN1_TYPE_CHOICE) {
                             // Get the mapping and input class & constant.
                             $childClass = $tempClass = FILE_ASN1_CLASS_UNIVERSAL;
-                            $constant = NULL;
+                            $constant = null;
                             if (isset($temp['constant'])) {
                                 $tempClass = isset($temp['class']) ? $temp['class'] : FILE_ASN1_CLASS_CONTEXT_SPECIFIC;
                             }
                             if (isset($child['class'])) {
                                 $childClass = $child['class'];
                                 $constant = $child['cast'];
-                            }
-                            elseif (isset($child['constant'])) {
+                            } elseif (isset($child['constant'])) {
                                 $childClass = FILE_ASN1_CLASS_CONTEXT_SPECIFIC;
                                 $constant = $child['constant'];
                             }
@@ -611,7 +611,7 @@ class File_ASN1 {
                     if ($maymatch) {
                         // Attempt submapping.
                         $candidate = $this->asn1map($temp, $child, $special);
-                        $maymatch = $candidate !== NULL;
+                        $maymatch = $candidate !== null;
                     }
 
                     if ($maymatch) {
@@ -624,12 +624,12 @@ class File_ASN1 {
                     } elseif (isset($child['default'])) {
                         $map[$key] = $child['default']; // Use default.
                     } elseif (!isset($child['optional'])) {
-                        return NULL; // Syntax error.
+                        return null; // Syntax error.
                     }
                 }
 
                 // Fail mapping if all input items have not been consumed.
-                return $i < $n? NULL: $map;
+                return $i < $n? null: $map;
 
             // the main diff between sets and sequences is the encapsulation of the foreach in another for loop
             case FILE_ASN1_TYPE_SET:
@@ -639,8 +639,8 @@ class File_ASN1 {
                 if (isset($mapping['min']) && isset($mapping['max'])) {
                     $child = $mapping['children'];
                     foreach ($decoded['content'] as $content) {
-                        if (($map[] = $this->asn1map($content, $child, $special)) === NULL) {
-                            return NULL;
+                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
+                            return null;
                         }
                     }
 
@@ -661,12 +661,11 @@ class File_ASN1 {
                         $maymatch = true;
                         if ($child['type'] != FILE_ASN1_TYPE_CHOICE) {
                             $childClass = FILE_ASN1_CLASS_UNIVERSAL;
-                            $constant = NULL;
+                            $constant = null;
                             if (isset($child['class'])) {
                                 $childClass = $child['class'];
                                 $constant = $child['cast'];
-                            }
-                            elseif (isset($child['constant'])) {
+                            } elseif (isset($child['constant'])) {
                                 $childClass = FILE_ASN1_CLASS_CONTEXT_SPECIFIC;
                                 $constant = $child['constant'];
                             }
@@ -683,7 +682,7 @@ class File_ASN1 {
                         if ($maymatch) {
                             // Attempt submapping.
                             $candidate = $this->asn1map($temp, $child, $special);
-                            $maymatch = $candidate !== NULL;
+                            $maymatch = $candidate !== null;
                         }
 
                         if (!$maymatch) {
@@ -704,7 +703,7 @@ class File_ASN1 {
                         if (isset($child['default'])) {
                             $map[$key] = $child['default'];
                         } elseif (!isset($child['optional'])) {
-                            return NULL;
+                            return null;
                         }
                     }
                 }
@@ -797,7 +796,7 @@ class File_ASN1 {
     function encodeDER($source, $mapping, $special = array())
     {
         $this->location = array();
-        return $this->_encode_der($source, $mapping, NULL, $special);
+        return $this->_encode_der($source, $mapping, null, $special);
     }
 
     /**
@@ -819,7 +818,7 @@ class File_ASN1 {
      * @return String
      * @access private
      */
-    function _encode_der($source, $mapping, $idx = NULL, $special = array())
+    function _encode_der($source, $mapping, $idx = null, $special = array())
     {
         if (is_object($source) && strtolower(get_class($source)) == 'file_asn1_element') {
             return $source->element;
@@ -850,7 +849,7 @@ class File_ASN1 {
                     $child = $mapping['children'];
 
                     foreach ($source as $content) {
-                        $temp = $this->_encode_der($content, $child, NULL, $special);
+                        $temp = $this->_encode_der($content, $child, null, $special);
                         if ($temp === false) {
                             return false;
                         }
@@ -1030,19 +1029,19 @@ class File_ASN1 {
 
                 switch (true) {
                     case !isset($source):
-                        return $this->_encode_der(NULL, array('type' => FILE_ASN1_TYPE_NULL) + $mapping, NULL, $special);
+                        return $this->_encode_der(null, array('type' => FILE_ASN1_TYPE_NULL) + $mapping, null, $special);
                     case is_int($source):
                     case is_object($source) && strtolower(get_class($source)) == 'math_biginteger':
-                        return $this->_encode_der($source, array('type' => FILE_ASN1_TYPE_INTEGER) + $mapping, NULL, $special);
+                        return $this->_encode_der($source, array('type' => FILE_ASN1_TYPE_INTEGER) + $mapping, null, $special);
                     case is_float($source):
-                        return $this->_encode_der($source, array('type' => FILE_ASN1_TYPE_REAL) + $mapping, NULL, $special);
+                        return $this->_encode_der($source, array('type' => FILE_ASN1_TYPE_REAL) + $mapping, null, $special);
                     case is_bool($source):
-                        return $this->_encode_der($source, array('type' => FILE_ASN1_TYPE_BOOLEAN) + $mapping, NULL, $special);
+                        return $this->_encode_der($source, array('type' => FILE_ASN1_TYPE_BOOLEAN) + $mapping, null, $special);
                     case is_array($source) && count($source) == 1:
                         $typename = implode('', array_keys($source));
                         $outtype = array_search($typename, $this->ANYmap, true);
                         if ($outtype !== false) {
-                            return $this->_encode_der($source[$typename], array('type' => $outtype) + $mapping, NULL, $special);
+                            return $this->_encode_der($source[$typename], array('type' => $outtype) + $mapping, null, $special);
                         }
                     }
 
@@ -1058,7 +1057,7 @@ class File_ASN1 {
                     user_error('No filters defined for ' . implode('/', $loc));
                     return false;
                 }
-                return $this->_encode_der($source, $filters + $mapping, NULL, $special);
+                return $this->_encode_der($source, $filters + $mapping, null, $special);
             case FILE_ASN1_TYPE_NULL:
                 $value = '';
                 break;
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/File/X509.php b/apps/files_external/3rdparty/phpseclib/phpseclib/File/X509.php
index 0b4e291361e..9e7b0b3b962 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/File/X509.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/File/X509.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP X.509 Parser
@@ -8,7 +7,7 @@
  *
  * Encode and decode X.509 certificates.
  *
- * The extensions are from {@link http://tools.ietf.org/html/rfc5280 RFC5280} and 
+ * The extensions are from {@link http://tools.ietf.org/html/rfc5280 RFC5280} and
  * {@link http://web.archive.org/web/19961027104704/http://www3.netscape.com/eng/security/cert-exts.html Netscape Certificate Extensions}.
  *
  * Note that loading an X.509 certificate and resaving it may invalidate the signature.  The reason being that the signature is based on a
@@ -23,10 +22,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,19 +34,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   File
- * @package    File_X509
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMXII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  File
+ * @package   File_X509
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMXII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
  * Include File_ASN1
  */
 if (!class_exists('File_ASN1')) {
-    require_once('ASN1.php');
+    include_once 'ASN1.php';
 }
 
 /**
@@ -124,12 +123,13 @@ define('FILE_X509_ATTR_REPLACE', -3); // Clear first, then add a value.
 /**
  * Pure-PHP X.509 Parser
  *
+ * @package File_X509
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.3.1
  * @access  public
- * @package File_X509
  */
-class File_X509 {
+class File_X509
+{
     /**
      * ASN.1 syntax for X.509 certificates
      *
@@ -248,7 +248,7 @@ class File_X509 {
      * The signature subject
      *
      * There's no guarantee File_X509 is going to reencode an X.509 cert in the same way it was originally
-     * encoded so we take save the portion of the original cert that the signature would have made for. 
+     * encoded so we take save the portion of the original cert that the signature would have made for.
      *
      * @var String
      * @access private
@@ -307,7 +307,7 @@ class File_X509 {
     function File_X509()
     {
         if (!class_exists('Math_BigInteger')) {
-            require_once('Math/BigInteger.php');
+            include_once 'Math/BigInteger.php';
         }
 
         // Explicitly Tagged Module, 1988 Syntax
@@ -1431,7 +1431,7 @@ class File_X509 {
             $this->currentCert = $cert;
 
             $currentKeyIdentifier = $this->getExtension('id-ce-subjectKeyIdentifier');
-            $this->currentKeyIdentifier = is_string($currentKeyIdentifier) ? $currentKeyIdentifier : NULL;
+            $this->currentKeyIdentifier = is_string($currentKeyIdentifier) ? $currentKeyIdentifier : null;
 
             unset($this->signatureSubject);
 
@@ -1469,7 +1469,7 @@ class File_X509 {
         $this->dn = $x509['tbsCertificate']['subject'];
 
         $currentKeyIdentifier = $this->getExtension('id-ce-subjectKeyIdentifier');
-        $this->currentKeyIdentifier = is_string($currentKeyIdentifier) ? $currentKeyIdentifier : NULL;
+        $this->currentKeyIdentifier = is_string($currentKeyIdentifier) ? $currentKeyIdentifier : null;
 
         return $x509;
     }
@@ -1496,33 +1496,33 @@ class File_X509 {
             default:
                 switch ($algorithm) {
                     case 'rsaEncryption':
-                        $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'] = 
-                            base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])));
+                        $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']
+                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])));
                 }
         }
 
         $asn1 = new File_ASN1();
-
         $asn1->loadOIDs($this->oids);
 
         $filters = array();
-        $filters['tbsCertificate']['signature']['parameters'] = 
-        $filters['tbsCertificate']['signature']['issuer']['rdnSequence']['value'] = 
-        $filters['tbsCertificate']['issuer']['rdnSequence']['value'] = 
-        $filters['tbsCertificate']['subject']['rdnSequence']['value'] = 
-        $filters['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = 
-        $filters['signatureAlgorithm']['parameters'] = 
-        $filters['authorityCertIssuer']['directoryName']['rdnSequence']['value'] = 
-        //$filters['policyQualifiers']['qualifier'] = 
-        $filters['distributionPoint']['fullName']['directoryName']['rdnSequence']['value'] = 
-        $filters['directoryName']['rdnSequence']['value'] = 
-            array('type' => FILE_ASN1_TYPE_UTF8_STRING);
+        $type_utf8_string = array('type' => FILE_ASN1_TYPE_UTF8_STRING);
+        $filters['tbsCertificate']['signature']['parameters'] = $type_utf8_string;
+        $filters['tbsCertificate']['signature']['issuer']['rdnSequence']['value'] = $type_utf8_string;
+        $filters['tbsCertificate']['issuer']['rdnSequence']['value'] = $type_utf8_string;
+        $filters['tbsCertificate']['subject']['rdnSequence']['value'] = $type_utf8_string;
+        $filters['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = $type_utf8_string;
+        $filters['signatureAlgorithm']['parameters'] = $type_utf8_string;
+        $filters['authorityCertIssuer']['directoryName']['rdnSequence']['value'] = $type_utf8_string;
+        //$filters['policyQualifiers']['qualifier'] = $type_utf8_string;
+        $filters['distributionPoint']['fullName']['directoryName']['rdnSequence']['value'] = $type_utf8_string;
+        $filters['directoryName']['rdnSequence']['value'] = $type_utf8_string;
+
         /* in the case of policyQualifiers/qualifier, the type has to be FILE_ASN1_TYPE_IA5_STRING.
            FILE_ASN1_TYPE_PRINTABLE_STRING will cause OpenSSL's X.509 parser to spit out random
            characters.
          */
-        $filters['policyQualifiers']['qualifier'] = 
-            array('type' => FILE_ASN1_TYPE_IA5_STRING);
+        $filters['policyQualifiers']['qualifier']
+            = array('type' => FILE_ASN1_TYPE_IA5_STRING);
 
         $asn1->loadFilters($filters);
 
@@ -1715,8 +1715,7 @@ class File_X509 {
                 if ($map === false) {
                     user_error($id . ' is not a currently supported attribute', E_USER_NOTICE);
                     unset($attributes[$i]);
-                }
-                elseif (is_array($attributes[$i]['value'])) {
+                } elseif (is_array($attributes[$i]['value'])) {
                     $values = &$attributes[$i]['value'];
                     for ($j = 0; $j < count($values); $j++) {
                         switch ($id) {
@@ -1963,7 +1962,7 @@ class File_X509 {
      * @param Integer $date optional
      * @access public
      */
-    function validateDate($date = NULL)
+    function validateDate($date = null)
     {
         if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
             return false;
@@ -1992,7 +1991,7 @@ class File_X509 {
      * Validate a signature
      *
      * Works on X.509 certs, CSR's and CRL's.
-     * Returns true if the signature is verified, false if it is not correct or NULL on error
+     * Returns true if the signature is verified, false if it is not correct or null on error
      *
      * By default returns false for self-signed certs. Call validateSignature(false) to make this support
      * self-signed.
@@ -2006,7 +2005,7 @@ class File_X509 {
     function validateSignature($caonly = true)
     {
         if (!is_array($this->currentCert) || !isset($this->signatureSubject)) {
-            return NULL;
+            return null;
         }
 
         /* TODO:
@@ -2107,7 +2106,7 @@ class File_X509 {
     /**
      * Validates a signature
      *
-     * Returns true if the signature is verified, false if it is not correct or NULL on error
+     * Returns true if the signature is verified, false if it is not correct or null on error
      *
      * @param String $publicKeyAlgorithm
      * @param String $publicKey
@@ -2122,7 +2121,7 @@ class File_X509 {
         switch ($publicKeyAlgorithm) {
             case 'rsaEncryption':
                 if (!class_exists('Crypt_RSA')) {
-                    require_once('Crypt/RSA.php');
+                    include_once 'Crypt/RSA.php';
                 }
                 $rsa = new Crypt_RSA();
                 $rsa->loadKey($publicKey);
@@ -2142,11 +2141,11 @@ class File_X509 {
                         }
                         break;
                     default:
-                        return NULL;
+                        return null;
                 }
                 break;
             default:
-                return NULL;
+                return null;
         }
 
         return true;
@@ -2367,7 +2366,7 @@ class File_X509 {
      * @return Mixed
      * @access public
      */
-    function getDNProp($propName, $dn = NULL, $withType = false)
+    function getDNProp($propName, $dn = null, $withType = false)
     {
         if (!isset($dn)) {
             $dn = $this->dn;
@@ -2421,7 +2420,7 @@ class File_X509 {
     function setDN($dn, $merge = false, $type = 'utf8String')
     {
         if (!$merge) {
-            $this->dn = NULL;
+            $this->dn = null;
         }
 
         if (is_array($dn)) {
@@ -2460,7 +2459,7 @@ class File_X509 {
      * @access public
      * @return Boolean
      */
-    function getDN($format = FILE_X509_DN_ARRAY, $dn = NULL)
+    function getDN($format = FILE_X509_DN_ARRAY, $dn = null)
     {
         if (!isset($dn)) {
             $dn = isset($this->currentCert['tbsCertList']) ? $this->currentCert['tbsCertList']['issuer'] : $this->dn;
@@ -2524,7 +2523,7 @@ class File_X509 {
             case FILE_X509_DN_HASH:
                 $dn = $this->getDN(FILE_X509_DN_CANON, $dn);
                 if (!class_exists('Crypt_Hash')) {
-                    require_once('Crypt/Hash.php');
+                    include_once 'Crypt/Hash.php';
                 }
                 $hash = new Crypt_Hash('sha1');
                 $hash = $hash->hash($dn);
@@ -2676,7 +2675,7 @@ class File_X509 {
     {
         switch (true) {
             case !empty($this->dn):
-                return $this->getDNProp($propName, NULL, $withType);
+                return $this->getDNProp($propName, null, $withType);
             case !isset($this->currentCert) || !is_array($this->currentCert):
                 break;
             case isset($this->currentCert['tbsCertificate']):
@@ -2792,7 +2791,7 @@ class File_X509 {
         switch ($keyinfo['algorithm']['algorithm']) {
             case 'rsaEncryption':
                 if (!class_exists('Crypt_RSA')) {
-                    require_once('Crypt/RSA.php');
+                    include_once 'Crypt/RSA.php';
                 }
                 $publicKey = new Crypt_RSA();
                 $publicKey->loadKey($key);
@@ -2865,17 +2864,17 @@ class File_X509 {
         switch ($algorithm) {
             case 'rsaEncryption':
                 if (!class_exists('Crypt_RSA')) {
-                    require_once('Crypt/RSA.php');
+                    include_once 'Crypt/RSA.php';
                 }
                 $this->publicKey = new Crypt_RSA();
                 $this->publicKey->loadKey($key);
                 $this->publicKey->setPublicKey();
                 break;
             default:
-                $this->publicKey = NULL;
+                $this->publicKey = null;
         }
 
-        $this->currentKeyIdentifier = NULL;
+        $this->currentKeyIdentifier = null;
         $this->currentCert = $csr;
 
         return $csr;
@@ -2902,8 +2901,8 @@ class File_X509 {
             default:
                 switch ($algorithm) {
                     case 'rsaEncryption':
-                        $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'] = 
-                            base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])));
+                        $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']
+                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])));
                 }
         }
 
@@ -2912,8 +2911,8 @@ class File_X509 {
         $asn1->loadOIDs($this->oids);
 
         $filters = array();
-        $filters['certificationRequestInfo']['subject']['rdnSequence']['value'] = 
-            array('type' => FILE_ASN1_TYPE_UTF8_STRING);
+        $filters['certificationRequestInfo']['subject']['rdnSequence']['value']
+            = array('type' => FILE_ASN1_TYPE_UTF8_STRING);
 
         $asn1->loadFilters($filters);
 
@@ -2990,17 +2989,17 @@ class File_X509 {
         switch ($algorithm) {
             case 'rsaEncryption':
                 if (!class_exists('Crypt_RSA')) {
-                    require_once('Crypt/RSA.php');
+                    include_once 'Crypt/RSA.php';
                 }
                 $this->publicKey = new Crypt_RSA();
                 $this->publicKey->loadKey($key);
                 $this->publicKey->setPublicKey();
                 break;
             default:
-                $this->publicKey = NULL;
+                $this->publicKey = null;
         }
 
-        $this->currentKeyIdentifier = NULL;
+        $this->currentKeyIdentifier = null;
         $this->currentCert = $spkac;
 
         return $spkac;
@@ -3048,14 +3047,14 @@ class File_X509 {
         $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
         $this->_mapInExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
-        $rclist = &$this->_subArray($crl,'tbsCertList/revokedCertificates');
+        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
         if (is_array($rclist)) {
             foreach ($rclist as $i => $extension) {
                 $this->_mapInExtensions($rclist, "$i/crlEntryExtensions", $asn1);
             }
         }
 
-        $this->currentKeyIdentifier = NULL;
+        $this->currentKeyIdentifier = null;
         $this->currentCert = $crl;
 
         return $crl;
@@ -3080,25 +3079,27 @@ class File_X509 {
         $asn1->loadOIDs($this->oids);
 
         $filters = array();
-        $filters['tbsCertList']['issuer']['rdnSequence']['value'] = 
-        $filters['tbsCertList']['signature']['parameters'] = 
-        $filters['signatureAlgorithm']['parameters'] = 
-            array('type' => FILE_ASN1_TYPE_UTF8_STRING);
+        $filters['tbsCertList']['issuer']['rdnSequence']['value']
+            = array('type' => FILE_ASN1_TYPE_UTF8_STRING);
+        $filters['tbsCertList']['signature']['parameters']
+            = array('type' => FILE_ASN1_TYPE_UTF8_STRING);
+        $filters['signatureAlgorithm']['parameters']
+            = array('type' => FILE_ASN1_TYPE_UTF8_STRING);
 
         if (empty($crl['tbsCertList']['signature']['parameters'])) {
-            $filters['tbsCertList']['signature']['parameters'] = 
-                array('type' => FILE_ASN1_TYPE_NULL);
+            $filters['tbsCertList']['signature']['parameters']
+                = array('type' => FILE_ASN1_TYPE_NULL);
         }
 
         if (empty($crl['signatureAlgorithm']['parameters'])) {
-            $filters['signatureAlgorithm']['parameters'] = 
-                array('type' => FILE_ASN1_TYPE_NULL);
+            $filters['signatureAlgorithm']['parameters']
+                = array('type' => FILE_ASN1_TYPE_NULL);
         }
 
         $asn1->loadFilters($filters);
 
         $this->_mapOutExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
-        $rclist = &$this->_subArray($crl,'tbsCertList/revokedCertificates');
+        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
         if (is_array($rclist)) {
             foreach ($rclist as $i => $extension) {
                 $this->_mapOutExtensions($rclist, "$i/crlEntryExtensions", $asn1);
@@ -3139,14 +3140,14 @@ class File_X509 {
             return false;
         }
 
-        $currentCert = isset($this->currentCert) ? $this->currentCert : NULL;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: NULL;
+        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
 
         if (isset($subject->currentCert) && is_array($subject->currentCert) && isset($subject->currentCert['tbsCertificate'])) {
             $this->currentCert = $subject->currentCert;
-            $this->currentCert['tbsCertificate']['signature']['algorithm'] =
-            $this->currentCert['signatureAlgorithm']['algorithm'] =
-                $signatureAlgorithm;
+            $this->currentCert['tbsCertificate']['signature']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+
             if (!empty($this->startDate)) {
                 $this->currentCert['tbsCertificate']['validity']['notBefore']['generalTime'] = $this->startDate;
                 unset($this->currentCert['tbsCertificate']['validity']['notBefore']['utcTime']);
@@ -3312,12 +3313,11 @@ class File_X509 {
         }
         $this->publicKey = $origPublicKey;
 
-        $currentCert = isset($this->currentCert) ? $this->currentCert : NULL;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: NULL;
+        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
 
         if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['certificationRequestInfo'])) {
-            $this->currentCert['signatureAlgorithm']['algorithm'] =
-                $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
             if (!empty($this->dn)) {
                 $this->currentCert['certificationRequestInfo']['subject'] = $this->dn;
             }
@@ -3366,8 +3366,8 @@ class File_X509 {
             return false;
         }
 
-        $currentCert = isset($this->currentCert) ? $this->currentCert : NULL;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : NULL;
+        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : null;
         $thisUpdate = !empty($this->startDate) ? $this->startDate : @date('D, d M y H:i:s O');
 
         if (isset($crl->currentCert) && is_array($crl->currentCert) && isset($crl->currentCert['tbsCertList'])) {
@@ -3400,10 +3400,9 @@ class File_X509 {
 
         if (!empty($this->serialNumber)) {
             $crlNumber = $this->serialNumber;
-        }
-        else {
+        } else {
             $crlNumber = $this->getExtension('id-ce-cRLNumber');
-            $crlNumber = $crlNumber !== false ? $crlNumber->add(new Math_BigInteger(1)) : NULL;
+            $crlNumber = $crlNumber !== false ? $crlNumber->add(new Math_BigInteger(1)) : null;
         }
 
         $this->removeExtension('id-ce-authorityKeyIdentifier');
@@ -3414,8 +3413,7 @@ class File_X509 {
         if (!$version) {
             if (!empty($tbsCertList['crlExtensions'])) {
                 $version = 1; // v2.
-            }
-            elseif (!empty($tbsCertList['revokedCertificates'])) {
+            } elseif (!empty($tbsCertList['revokedCertificates'])) {
                 foreach ($tbsCertList['revokedCertificates'] as $cert) {
                     if (!empty($cert['crlEntryExtensions'])) {
                         $version = 1; // v2.
@@ -3613,7 +3611,7 @@ class File_X509 {
      * @access private
      * @return array ref or false
      */
-    function &_extensions(&$root, $path = NULL, $create = false)
+    function &_extensions(&$root, $path = null, $create = false)
     {
         if (!isset($root)) {
             $root = $this->currentCert;
@@ -3667,7 +3665,7 @@ class File_X509 {
      * @access private
      * @return Boolean
      */
-    function _removeExtension($id, $path = NULL)
+    function _removeExtension($id, $path = null)
     {
         $extensions = &$this->_extensions($this->currentCert, $path);
 
@@ -3698,7 +3696,7 @@ class File_X509 {
      * @access private
      * @return Mixed
      */
-    function _getExtension($id, $cert = NULL, $path = NULL)
+    function _getExtension($id, $cert = null, $path = null)
     {
         $extensions = $this->_extensions($cert, $path);
 
@@ -3723,7 +3721,7 @@ class File_X509 {
      * @access private
      * @return Array
      */
-    function _getExtensions($cert = NULL, $path = NULL)
+    function _getExtensions($cert = null, $path = null)
     {
         $exts = $this->_extensions($cert, $path);
         $extensions = array();
@@ -3748,7 +3746,7 @@ class File_X509 {
      * @access private
      * @return Boolean
      */
-    function _setExtension($id, $value, $critical = false, $replace = true, $path = NULL)
+    function _setExtension($id, $value, $critical = false, $replace = true, $path = null)
     {
         $extensions = &$this->_extensions($this->currentCert, $path, true);
 
@@ -3795,7 +3793,7 @@ class File_X509 {
      * @access public
      * @return Mixed
      */
-    function getExtension($id, $cert = NULL)
+    function getExtension($id, $cert = null)
     {
         return $this->_getExtension($id, $cert);
     }
@@ -3807,7 +3805,7 @@ class File_X509 {
      * @access public
      * @return Array
      */
-    function getExtensions($cert = NULL)
+    function getExtensions($cert = null)
     {
         return $this->_getExtensions($cert);
     }
@@ -3886,7 +3884,7 @@ class File_X509 {
      * @access public
      * @return Mixed
      */
-    function getAttribute($id, $disposition = FILE_X509_ATTR_ALL, $csr = NULL)
+    function getAttribute($id, $disposition = FILE_X509_ATTR_ALL, $csr = null)
     {
         if (empty($csr)) {
             $csr = $this->currentCert;
@@ -3926,7 +3924,7 @@ class File_X509 {
      * @access public
      * @return Array
      */
-    function getAttributes($csr = NULL)
+    function getAttributes($csr = null)
     {
         if (empty($csr)) {
             $csr = $this->currentCert;
@@ -4035,7 +4033,7 @@ class File_X509 {
      * @access public
      * @return String binary key identifier
      */
-    function computeKeyIdentifier($key = NULL, $method = 1)
+    function computeKeyIdentifier($key = null, $method = 1)
     {
         if (is_null($key)) {
             $key = $this;
@@ -4064,7 +4062,7 @@ class File_X509 {
                 $raw = base64_decode($raw);
                 // If the key is private, compute identifier from its corresponding public key.
                 if (!class_exists('Crypt_RSA')) {
-                    require_once('Crypt/RSA.php');
+                    include_once 'Crypt/RSA.php';
                 }
                 $key = new Crypt_RSA();
                 if (!$key->loadKey($raw)) {
@@ -4096,7 +4094,7 @@ class File_X509 {
 
         // Now we have the key string: compute its sha-1 sum.
         if (!class_exists('Crypt_Hash')) {
-            require_once('Crypt/Hash.php');
+            include_once 'Crypt/Hash.php';
         }
         $hash = new Crypt_Hash('sha1');
         $hash = $hash->hash($key);
@@ -4228,7 +4226,7 @@ class File_X509 {
      * @access public
      * @return Boolean
      */
-    function revoke($serial, $date = NULL)
+    function revoke($serial, $date = null)
     {
         if (isset($this->currentCert['tbsCertList'])) {
             if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
@@ -4293,7 +4291,7 @@ class File_X509 {
      * @access public
      * @return array
      */
-    function listRevoked($crl = NULL)
+    function listRevoked($crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
@@ -4344,7 +4342,7 @@ class File_X509 {
      * @access public
      * @return Mixed
      */
-    function getRevokedCertificateExtension($serial, $id, $crl = NULL)
+    function getRevokedCertificateExtension($serial, $id, $crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
@@ -4367,7 +4365,7 @@ class File_X509 {
      * @access public
      * @return Array
      */
-    function getRevokedCertificateExtensions($serial, $crl = NULL)
+    function getRevokedCertificateExtensions($serial, $crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
@@ -4415,15 +4413,15 @@ class File_X509 {
      */
     function _extractBER($str)
     {
-        /*
-            X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them above and beyond the ceritificate. ie.
-            some may have the following preceding the -----BEGIN CERTIFICATE----- line:
-
-            Bag Attributes
-                localKeyID: 01 00 00 00
-            subject=/O=organization/OU=org unit/CN=common name
-            issuer=/O=organization/CN=common name
-        */
+        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
+         * above and beyond the ceritificate.
+         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
+         *
+         * Bag Attributes
+         *     localKeyID: 01 00 00 00
+         * subject=/O=organization/OU=org unit/CN=common name
+         * issuer=/O=organization/CN=common name
+         */
         $temp = preg_replace('#.*?^-+[^-]+-+#ms', '', $str, 1);
         // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
         $temp = preg_replace('#-+[^-]+-+#', '', $temp);
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Math/BigInteger.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Math/BigInteger.php
index e40433de5bd..1b4ea675fcc 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Math/BigInteger.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Math/BigInteger.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP arbitrary precision integer arithmetic library.
@@ -9,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * {@internal (all DocBlock comments regarding implementation - such as the one that follows - refer to the 
+ * {@internal (all DocBlock comments regarding implementation - such as the one that follows - refer to the
  * {@link MATH_BIGINTEGER_MODE_INTERNAL MATH_BIGINTEGER_MODE_INTERNAL} mode)
  *
  * Math_BigInteger uses base-2**26 to perform operations such as multiplication and division and
@@ -53,10 +52,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -65,12 +64,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Math
- * @package    Math_BigInteger
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVI Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://pear.php.net/package/Math_BigInteger
+ * @category  Math
+ * @package   Math_BigInteger
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVI Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
  */
 
 /**#@+
@@ -174,12 +173,13 @@ define('MATH_BIGINTEGER_KARATSUBA_CUTOFF', 25);
  * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
  * numbers.
  *
+ * @package Math_BigInteger
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 1.0.0RC4
  * @access  public
- * @package Math_BigInteger
  */
-class Math_BigInteger {
+class Math_BigInteger
+{
     /**
      * Holds the BigInteger's value.
      *
@@ -223,7 +223,7 @@ class Math_BigInteger {
     /**
      * Mode independent value used for serialization.
      *
-     * If the bcmath or gmp extensions are installed $this->value will be a non-serializable resource, hence the need for 
+     * If the bcmath or gmp extensions are installed $this->value will be a non-serializable resource, hence the need for
      * a variable that'll be serializable regardless of whether or not extensions are being used.  Unlike $this->value,
      * however, $this->hex is only calculated when $this->__sleep() is called.
      *
@@ -797,7 +797,7 @@ class Math_BigInteger {
             $vars[] = 'precision';
         }
         return $vars;
-        
+
     }
 
     /**
@@ -2279,7 +2279,7 @@ class Math_BigInteger {
     /**
      * Montgomery Multiply
      *
-     * Interleaves the montgomery reduction and long multiplication algorithms together as described in 
+     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
      * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
      *
      * @see _prepMontgomery()
@@ -2359,7 +2359,7 @@ class Math_BigInteger {
      * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
      *
      * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
-     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields 
+     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields
      * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
      * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
      * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
@@ -3290,7 +3290,7 @@ class Math_BigInteger {
      * @return Boolean
      * @access public
      * @internal Uses the
-     *     {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.  See 
+     *     {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.  See
      *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24}.
      */
     function isPrime($t = false)
@@ -3299,6 +3299,7 @@ class Math_BigInteger {
 
         if (!$t) {
             // see HAC 4.49 "Note (controlling the error probability)"
+            // @codingStandardsIgnoreStart
                  if ($length >= 163) { $t =  2; } // floor(1300 / 8)
             else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
             else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
@@ -3311,6 +3312,7 @@ class Math_BigInteger {
             else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
             else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
             else                     { $t = 27; }
+            // @codingStandardsIgnoreEnd
         }
 
         // ie. gmp_testbit($this, 0)
@@ -3339,16 +3341,16 @@ class Math_BigInteger {
 
         if (!isset($primes)) {
             $primes = array(
-                3,    5,    7,    11,   13,   17,   19,   23,   29,   31,   37,   41,   43,   47,   53,   59,   
-                61,   67,   71,   73,   79,   83,   89,   97,   101,  103,  107,  109,  113,  127,  131,  137,  
-                139,  149,  151,  157,  163,  167,  173,  179,  181,  191,  193,  197,  199,  211,  223,  227,  
-                229,  233,  239,  241,  251,  257,  263,  269,  271,  277,  281,  283,  293,  307,  311,  313,  
-                317,  331,  337,  347,  349,  353,  359,  367,  373,  379,  383,  389,  397,  401,  409,  419,  
-                421,  431,  433,  439,  443,  449,  457,  461,  463,  467,  479,  487,  491,  499,  503,  509,  
-                521,  523,  541,  547,  557,  563,  569,  571,  577,  587,  593,  599,  601,  607,  613,  617,  
-                619,  631,  641,  643,  647,  653,  659,  661,  673,  677,  683,  691,  701,  709,  719,  727,  
-                733,  739,  743,  751,  757,  761,  769,  773,  787,  797,  809,  811,  821,  823,  827,  829,  
-                839,  853,  857,  859,  863,  877,  881,  883,  887,  907,  911,  919,  929,  937,  941,  947,  
+                3,    5,    7,    11,   13,   17,   19,   23,   29,   31,   37,   41,   43,   47,   53,   59,
+                61,   67,   71,   73,   79,   83,   89,   97,   101,  103,  107,  109,  113,  127,  131,  137,
+                139,  149,  151,  157,  163,  167,  173,  179,  181,  191,  193,  197,  199,  211,  223,  227,
+                229,  233,  239,  241,  251,  257,  263,  269,  271,  277,  281,  283,  293,  307,  311,  313,
+                317,  331,  337,  347,  349,  353,  359,  367,  373,  379,  383,  389,  397,  401,  409,  419,
+                421,  431,  433,  439,  443,  449,  457,  461,  463,  467,  479,  487,  491,  499,  503,  509,
+                521,  523,  541,  547,  557,  563,  569,  571,  577,  587,  593,  599,  601,  607,  613,  617,
+                619,  631,  641,  643,  647,  653,  659,  661,  673,  677,  683,  691,  701,  709,  719,  727,
+                733,  739,  743,  751,  757,  761,  769,  773,  787,  797,  809,  811,  821,  823,  827,  829,
+                839,  853,  857,  859,  863,  877,  881,  883,  887,  907,  911,  919,  929,  937,  941,  947,
                 953,  967,  971,  977,  983,  991,  997
             );
 
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SCP.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SCP.php
index 88180cac67a..4cfa357009f 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SCP.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SCP.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of SCP.
@@ -30,10 +29,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -42,12 +41,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Net
- * @package    Net_SCP
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMX Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Net
+ * @package   Net_SCP
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMX Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**#@+
@@ -82,12 +81,13 @@ define('NET_SCP_SSH2',  2);
 /**
  * Pure-PHP implementations of SCP.
  *
+ * @package Net_SCP
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Net_SCP
  */
-class Net_SCP {
+class Net_SCP
+{
     /**
      * SSH Object
      *
@@ -151,7 +151,7 @@ class Net_SCP {
      * So, for example, if you set $data to 'filename.ext' and then do Net_SCP::get(), you will get a file, twelve bytes
      * long, containing 'filename.ext' as its contents.
      *
-     * Setting $mode to NET_SCP_LOCAL_FILE will change the above behavior.  With NET_SCP_LOCAL_FILE, $remote_file will 
+     * Setting $mode to NET_SCP_LOCAL_FILE will change the above behavior.  With NET_SCP_LOCAL_FILE, $remote_file will
      * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
      * large $remote_file will be, as well.
      *
@@ -181,7 +181,7 @@ class Net_SCP {
         }
 
         if ($this->mode == NET_SCP_SSH2) {
-            $this->packet_size = $this->ssh->packet_size_client_to_server[NET_SSH2_CHANNEL_EXEC];
+            $this->packet_size = $this->ssh->packet_size_client_to_server[NET_SSH2_CHANNEL_EXEC] - 4;
         }
 
         $remote_file = basename($remote_file);
@@ -353,7 +353,7 @@ class Net_SCP {
     {
         switch ($this->mode) {
             case NET_SCP_SSH2:
-                $this->ssh->_close_channel(NET_SSH2_CHANNEL_EXEC);
+                $this->ssh->_close_channel(NET_SSH2_CHANNEL_EXEC, true);
                 break;
             case NET_SCP_SSH1:
                 $this->ssh->disconnect();
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SFTP.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SFTP.php
index 5356ffbf77a..68d944f9f3f 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SFTP.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SFTP.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of SFTP.
@@ -34,10 +33,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -46,19 +45,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Net
- * @package    Net_SFTP
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMIX Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Net
+ * @package   Net_SFTP
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMIX Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
  * Include Net_SSH2
  */
 if (!class_exists('Net_SSH2')) {
-    require_once('SSH2.php');
+    include_once 'SSH2.php';
 }
 
 /**#@+
@@ -116,12 +115,13 @@ define('NET_SFTP_RESUME_START',  8);
 /**
  * Pure-PHP implementations of SFTP.
  *
+ * @package Net_SFTP
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Net_SFTP
  */
-class Net_SFTP extends Net_SSH2 {
+class Net_SFTP extends Net_SSH2
+{
     /**
      * Packet Types
      *
@@ -233,7 +233,7 @@ class Net_SFTP extends Net_SSH2 {
      * Directory Cache
      *
      * Rather than always having to open a directory and close it immediately there after to see if a file is a directory or
-     * rather than always 
+     * rather than always
      *
      * @see Net_SFTP::_save_dir()
      * @see Net_SFTP::_remove_dir()
@@ -347,7 +347,7 @@ class Net_SFTP extends Net_SSH2 {
             0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
             0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
             // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
-            // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in 
+            // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
             // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
             // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
               -1 << 31 => 'NET_SFTP_ATTR_EXTENDED'
@@ -402,7 +402,7 @@ class Net_SFTP extends Net_SSH2 {
     function login($username)
     {
         $args = func_get_args();
-        if (!call_user_func_array(array('Net_SSH2', 'login'), $args)) {
+        if (!call_user_func_array(array(&$this, '_login'), $args)) {
             return false;
         }
 
@@ -635,7 +635,11 @@ class Net_SFTP extends Net_SSH2 {
             return false;
         }
 
-        if ($dir[strlen($dir) - 1] != '/') {
+        // assume current dir if $dir is empty
+        if ($dir === '') {
+            $dir = './';
+        // suffix a slash if needed
+        } elseif ($dir[strlen($dir) - 1] != '/') {
             $dir.= '/';
         }
 
@@ -1038,7 +1042,7 @@ class Net_SFTP extends Net_SSH2 {
      */
     function truncate($filename, $new_size)
     {
-        $attr = pack('N3', NET_SFTP_ATTR_SIZE, $new_size / 0x100000000, $new_size);
+        $attr = pack('N3', NET_SFTP_ATTR_SIZE, $new_size / 4294967296, $new_size); // 4294967296 == 0x100000000 == 1<<32
 
         return $this->_setstat($filename, $attr, false);
     }
@@ -1054,7 +1058,7 @@ class Net_SFTP extends Net_SSH2 {
      * @return Boolean
      * @access public
      */
-    function touch($filename, $time = NULL, $atime = NULL)
+    function touch($filename, $time = null, $atime = null)
     {
         if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
             return false;
@@ -1097,7 +1101,7 @@ class Net_SFTP extends Net_SSH2 {
     /**
      * Changes file or directory owner
      *
-     * Returns TRUE on success or FALSE on error.
+     * Returns true on success or false on error.
      *
      * @param String $filename
      * @param Integer $uid
@@ -1117,7 +1121,7 @@ class Net_SFTP extends Net_SSH2 {
     /**
      * Changes file or directory group
      *
-     * Returns TRUE on success or FALSE on error.
+     * Returns true on success or false on error.
      *
      * @param String $filename
      * @param Integer $gid
@@ -1135,8 +1139,8 @@ class Net_SFTP extends Net_SSH2 {
     /**
      * Set permissions on a file.
      *
-     * Returns the new file permissions on success or FALSE on error.
-     * If $recursive is true than this just returns TRUE or FALSE.
+     * Returns the new file permissions on success or false on error.
+     * If $recursive is true than this just returns true or false.
      *
      * @param Integer $mode
      * @param String $filename
@@ -1216,7 +1220,7 @@ class Net_SFTP extends Net_SSH2 {
         }
 
         /*
-         "Because some systems must use separate system calls to set various attributes, it is possible that a failure 
+         "Because some systems must use separate system calls to set various attributes, it is possible that a failure
           response will be returned, but yet some of the attributes may be have been successfully modified.  If possible,
           servers SHOULD avoid this situation; however, clients MUST be aware that this is possible."
 
@@ -1326,7 +1330,7 @@ class Net_SFTP extends Net_SSH2 {
         }
 
         $dir = $this->_realpath($dir);
-        // by not providing any permissions, hopefully the server will use the logged in users umask - their 
+        // by not providing any permissions, hopefully the server will use the logged in users umask - their
         // default permissions.
         $attr = $mode == -1 ? "\0\0\0\0" : pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
 
@@ -1424,7 +1428,7 @@ class Net_SFTP extends Net_SSH2 {
      * So, for example, if you set $data to 'filename.ext' and then do Net_SFTP::get(), you will get a file, twelve bytes
      * long, containing 'filename.ext' as its contents.
      *
-     * Setting $mode to NET_SFTP_LOCAL_FILE will change the above behavior.  With NET_SFTP_LOCAL_FILE, $remote_file will 
+     * Setting $mode to NET_SFTP_LOCAL_FILE will change the above behavior.  With NET_SFTP_LOCAL_FILE, $remote_file will
      * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
      * large $remote_file will be, as well.
      *
@@ -1502,8 +1506,6 @@ class Net_SFTP extends Net_SSH2 {
                 return false;
         }
 
-        $initialize = true;
-
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.3
         if ($mode & NET_SFTP_LOCAL_FILE) {
             if (!is_file($data)) {
@@ -1537,7 +1539,7 @@ class Net_SFTP extends Net_SSH2 {
         while ($sent < $size) {
             $temp = $mode & NET_SFTP_LOCAL_FILE ? fread($fp, $sftp_packet_size) : substr($data, $sent, $sftp_packet_size);
             $subtemp = $offset + $sent;
-            $packet = pack('Na*N3a*', strlen($handle), $handle, $subtemp / 0x100000000, $subtemp, strlen($temp), $temp);
+            $packet = pack('Na*N3a*', strlen($handle), $handle, $subtemp / 4294967296, $subtemp, strlen($temp), $temp);
             if (!$this->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
                 fclose($fp);
                 return false;
@@ -1683,9 +1685,10 @@ class Net_SFTP extends Net_SSH2 {
             $content = '';
         }
 
+        $start = $offset;
         $size = $this->max_sftp_packet < $length || $length < 0 ? $this->max_sftp_packet : $length;
         while (true) {
-            $packet = pack('Na*N3', strlen($handle), $handle, $offset / 0x100000000, $offset, $size);
+            $packet = pack('Na*N3', strlen($handle), $handle, $offset / 4294967296, $offset, $size);
             if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) {
                 if ($local_file !== false) {
                     fclose($fp);
@@ -1716,12 +1719,12 @@ class Net_SFTP extends Net_SSH2 {
                     return false;
             }
 
-            if ($length > 0 && $length <= $offset - $size) {
+            if ($length > 0 && $length <= $offset - $start) {
                 break;
             }
         }
 
-        if ($length > 0 && $length <= $offset - $size) {
+        if ($length > 0 && $length <= $offset - $start) {
             if ($local_file === false) {
                 $content = substr($content, 0, $length);
             } else {
@@ -1923,7 +1926,7 @@ class Net_SFTP extends Net_SSH2 {
                     // (0xFFFFFFFF bytes), anyway.  as such, we'll just represent all file sizes that are bigger than
                     // 4GB as being 4GB.
                     extract(unpack('Nupper/Nsize', $this->_string_shift($response, 8)));
-                    $attr['size'] = $upper ? 0x100000000 * $upper : 0;
+                    $attr['size'] = $upper ? 4294967296 * $upper : 0;
                     $attr['size']+= $size < 0 ? ($size & 0x7FFFFFFF) + 0x80000000 : $size;
                     break;
                 case NET_SFTP_ATTR_UIDGID: // 0x00000002 (SFTPv3 only)
@@ -2054,7 +2057,7 @@ class Net_SFTP extends Net_SSH2 {
         $stop = strtok(microtime(), ' ') + strtok('');
 
         if (defined('NET_SFTP_LOGGING')) {
-            $packet_type = '-> ' . $this->packet_types[$type] . 
+            $packet_type = '-> ' . $this->packet_types[$type] .
                            ' (' . round($stop - $start, 4) . 's)';
             if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) {
                 echo "<pre>\r\n" . $this->_format_log(array($data), array($packet_type)) . "\r\n</pre>\r\n";
@@ -2130,7 +2133,7 @@ class Net_SFTP extends Net_SSH2 {
         $packet = $this->_string_shift($this->packet_buffer, $length);
 
         if (defined('NET_SFTP_LOGGING')) {
-            $packet_type = '<- ' . $this->packet_types[$this->packet_type] . 
+            $packet_type = '<- ' . $this->packet_types[$this->packet_type] .
                            ' (' . round($stop - $start, 4) . 's)';
             if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) {
                 echo "<pre>\r\n" . $this->_format_log(array($packet), array($packet_type)) . "\r\n</pre>\r\n";
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SFTP/Stream.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SFTP/Stream.php
index 0572c5c4025..48b79b3ef7f 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SFTP/Stream.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SFTP/Stream.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * SFTP Stream Wrapper
@@ -14,10 +13,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,23 +25,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Net
- * @package    Net_SFTP_Stream
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMXIII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Net
+ * @package   Net_SFTP_Stream
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMXIII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**
  * SFTP Stream Wrapper
  *
+ * @package Net_SFTP_Stream
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.3.2
  * @access  public
- * @package Net_SFTP_Stream
  */
-class Net_SFTP_Stream {
+class Net_SFTP_Stream
+{
     /**
      * SFTP instances
      *
@@ -134,8 +134,12 @@ class Net_SFTP_Stream {
      */
     function Net_SFTP_Stream()
     {
+        if (defined('NET_SFTP_STREAM_LOGGING')) {
+            echo "__construct()\r\n";
+        }
+
         if (!class_exists('Net_SFTP')) {
-            require_once('Net/SFTP.php');
+            include_once 'Net/SFTP.php';
         }
     }
 
@@ -513,7 +517,7 @@ class Net_SFTP_Stream {
      * Open directory handle
      *
      * The only $options is "whether or not to enforce safe_mode (0x04)". Since safe mode was deprecated in 5.3 and
-     * removed in 5.4 I'm just going to ignore it 
+     * removed in 5.4 I'm just going to ignore it
      *
      * @param String $path
      * @param Integer $options
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SSH1.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SSH1.php
index 83d5980d00a..0a6aa908289 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SSH1.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SSH1.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of SSHv1.
@@ -36,7 +35,7 @@
  * ?>
  * </code>
  *
- * More information on the SSHv1 specification can be found by reading 
+ * More information on the SSHv1 specification can be found by reading
  * {@link http://www.snailbook.com/docs/protocol-1.5.txt protocol-1.5.txt}.
  *
  * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -45,10 +44,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -57,12 +56,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Net
- * @package    Net_SSH1
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Net
+ * @package   Net_SSH1
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**#@+
@@ -202,11 +201,11 @@ define('NET_SSH1_LOG_COMPLEX', 2);
 /**
  * Outputs the content real-time
  */
-define('NET_SSH2_LOG_REALTIME', 3);
+define('NET_SSH1_LOG_REALTIME', 3);
 /**
  * Dumps the content real-time to a file
  */
-define('NET_SSH2_LOG_REALTIME_FILE', 4);
+define('NET_SSH1_LOG_REALTIME_FILE', 4);
 /**#@-*/
 
 /**#@+
@@ -226,12 +225,13 @@ define('NET_SSH1_READ_REGEX', 2);
 /**
  * Pure-PHP implementation of SSHv1.
  *
+ * @package Net_SSH1
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Net_SSH1
  */
-class Net_SSH1 {
+class Net_SSH1
+{
     /**
      * The SSH identifier
      *
@@ -429,12 +429,36 @@ class Net_SSH1 {
     /**
      * Current Timeout
      *
-     * @see Net_SSH2::_get_channel_packet()
+     * @see Net_SSH1::_get_channel_packet()
      * @access private
      */
     var $curTimeout;
 
     /**
+     * Log Boundary
+     *
+     * @see Net_SSH1::_format_log
+     * @access private
+     */
+    var $log_boundary = ':';
+
+    /**
+     * Log Long Width
+     *
+     * @see Net_SSH1::_format_log
+     * @access private
+     */
+    var $log_long_width = 65;
+
+    /**
+     * Log Short Width
+     *
+     * @see Net_SSH1::_format_log
+     * @access private
+     */
+    var $log_short_width = 16;
+
+    /**
      * Default Constructor.
      *
      * Connects to an SSHv1 server
@@ -449,16 +473,16 @@ class Net_SSH1 {
     function Net_SSH1($host, $port = 22, $timeout = 10, $cipher = NET_SSH1_CIPHER_3DES)
     {
         if (!class_exists('Math_BigInteger')) {
-            require_once('Math/BigInteger.php');
+            include_once 'Math/BigInteger.php';
         }
 
         // Include Crypt_Random
         // the class_exists() will only be called if the crypt_random_string function hasn't been defined and
         // will trigger a call to __autoload() if you're wanting to auto-load classes
-        // call function_exists() a second time to stop the require_once from being called outside
+        // call function_exists() a second time to stop the include_once from being called outside
         // of the auto loader
         if (!function_exists('crypt_random_string') && !class_exists('Crypt_Random') && !function_exists('crypt_random_string')) {
-            require_once('Crypt/Random.php');
+            include_once 'Crypt/Random.php';
         }
 
         $this->protocol_flags = array(
@@ -603,7 +627,7 @@ class Net_SSH1 {
             //    break;
             case NET_SSH1_CIPHER_DES:
                 if (!class_exists('Crypt_DES')) {
-                    require_once('Crypt/DES.php');
+                    include_once 'Crypt/DES.php';
                 }
                 $this->crypto = new Crypt_DES();
                 $this->crypto->disablePadding();
@@ -612,7 +636,7 @@ class Net_SSH1 {
                 break;
             case NET_SSH1_CIPHER_3DES:
                 if (!class_exists('Crypt_TripleDES')) {
-                    require_once('Crypt/TripleDES.php');
+                    include_once 'Crypt/TripleDES.php';
                 }
                 $this->crypto = new Crypt_TripleDES(CRYPT_DES_MODE_3CBC);
                 $this->crypto->disablePadding();
@@ -621,7 +645,7 @@ class Net_SSH1 {
                 break;
             //case NET_SSH1_CIPHER_RC4:
             //    if (!class_exists('Crypt_RC4')) {
-            //        require_once('Crypt/RC4.php');
+            //        include_once('Crypt/RC4.php');
             //    }
             //    $this->crypto = new Crypt_RC4();
             //    $this->crypto->enableContinuousBuffer();
@@ -1017,7 +1041,7 @@ class Net_SSH1 {
 
         if ($this->curTimeout) {
             $read = array($this->fsock);
-            $write = $except = NULL;
+            $write = $except = null;
 
             $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
             $sec = floor($this->curTimeout);
@@ -1253,7 +1277,7 @@ class Net_SSH1 {
     {
         /*
         if (!class_exists('Crypt_RSA')) {
-            require_once('Crypt/RSA.php');
+            include_once 'Crypt/RSA.php';
         }
 
         $rsa = new Crypt_RSA();
@@ -1318,7 +1342,7 @@ class Net_SSH1 {
     /**
      * Returns a log of the packets that have been sent and received.
      *
-     * Returns a string if NET_SSH2_LOGGING == NET_SSH2_LOG_COMPLEX, an array if NET_SSH2_LOGGING == NET_SSH2_LOG_SIMPLE and false if !defined('NET_SSH2_LOGGING')
+     * Returns a string if NET_SSH1_LOGGING == NET_SSH1_LOG_COMPLEX, an array if NET_SSH1_LOGGING == NET_SSH1_LOG_SIMPLE and false if !defined('NET_SSH1_LOGGING')
      *
      * @access public
      * @return String or Array
@@ -1351,8 +1375,6 @@ class Net_SSH1 {
      */
     function _format_log($message_log, $message_number_log)
     {
-        static $boundary = ':', $long_width = 65, $short_width = 16;
-
         $output = '';
         for ($i = 0; $i < count($message_log); $i++) {
             $output.= $message_number_log[$i] . "\r\n";
@@ -1362,19 +1384,13 @@ class Net_SSH1 {
                 if (strlen($current_log)) {
                     $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
                 }
-                $fragment = $this->_string_shift($current_log, $short_width);
-                $hex = substr(
-                           preg_replace(
-                               '#(.)#es',
-                               '"' . $boundary . '" . str_pad(dechex(ord(substr("\\1", -1))), 2, "0", STR_PAD_LEFT)',
-                               $fragment),
-                           strlen($boundary)
-                       );
+                $fragment = $this->_string_shift($current_log, $this->log_short_width);
+                $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
                 // replace non ASCII printable characters with dots
                 // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
                 // also replace < with a . since < messes up the output on web browsers
                 $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output.= str_pad($hex, $long_width - $short_width, ' ') . $raw . "\r\n";
+                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
                 $j++;
             } while (strlen($current_log));
             $output.= "\r\n";
@@ -1384,6 +1400,20 @@ class Net_SSH1 {
     }
 
     /**
+     * Helper function for _format_log
+     *
+     * For use with preg_replace_callback()
+     *
+     * @param Array $matches
+     * @access private
+     * @return String
+     */
+    function _format_log_helper($matches)
+    {
+        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
+    }
+
+    /**
      * Return the server key public exponent
      *
      * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
@@ -1496,57 +1526,57 @@ class Net_SSH1 {
      */
     function _append_log($protocol_flags, $message)
     {
-            switch (NET_SSH1_LOGGING) {
-                // useful for benchmarks
-                case NET_SSH1_LOG_SIMPLE:
-                    $this->protocol_flags_log[] = $protocol_flags;
-                    break;
-                // the most useful log for SSH1
-                case NET_SSH1_LOG_COMPLEX:
-                    $this->protocol_flags_log[] = $protocol_flags;
-                    $this->_string_shift($message);
-                    $this->log_size+= strlen($message);
-                    $this->message_log[] = $message;
-                    while ($this->log_size > NET_SSH2_LOG_MAX_SIZE) {
-                        $this->log_size-= strlen(array_shift($this->message_log));
-                        array_shift($this->protocol_flags_log);
-                    }
-                    break;
-                // dump the output out realtime; packets may be interspersed with non packets,
-                // passwords won't be filtered out and select other packets may not be correctly
-                // identified
-                case NET_SSH1_LOG_REALTIME:
-                    echo "<pre>\r\n" . $this->_format_log(array($message), array($protocol_flags)) . "\r\n</pre>\r\n";
-                    @flush();
-                    @ob_flush();
+        switch (NET_SSH1_LOGGING) {
+            // useful for benchmarks
+            case NET_SSH1_LOG_SIMPLE:
+                $this->protocol_flags_log[] = $protocol_flags;
+                break;
+            // the most useful log for SSH1
+            case NET_SSH1_LOG_COMPLEX:
+                $this->protocol_flags_log[] = $protocol_flags;
+                $this->_string_shift($message);
+                $this->log_size+= strlen($message);
+                $this->message_log[] = $message;
+                while ($this->log_size > NET_SSH1_LOG_MAX_SIZE) {
+                    $this->log_size-= strlen(array_shift($this->message_log));
+                    array_shift($this->protocol_flags_log);
+                }
+                break;
+            // dump the output out realtime; packets may be interspersed with non packets,
+            // passwords won't be filtered out and select other packets may not be correctly
+            // identified
+            case NET_SSH1_LOG_REALTIME:
+                echo "<pre>\r\n" . $this->_format_log(array($message), array($protocol_flags)) . "\r\n</pre>\r\n";
+                @flush();
+                @ob_flush();
+                break;
+            // basically the same thing as NET_SSH1_LOG_REALTIME with the caveat that NET_SSH1_LOG_REALTIME_FILE
+            // needs to be defined and that the resultant log file will be capped out at NET_SSH1_LOG_MAX_SIZE.
+            // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
+            // at the beginning of the file
+            case NET_SSH1_LOG_REALTIME_FILE:
+                if (!isset($this->realtime_log_file)) {
+                    // PHP doesn't seem to like using constants in fopen()
+                    $filename = NET_SSH1_LOG_REALTIME_FILE;
+                    $fp = fopen($filename, 'w');
+                    $this->realtime_log_file = $fp;
+                }
+                if (!is_resource($this->realtime_log_file)) {
                     break;
-                // basically the same thing as NET_SSH1_LOG_REALTIME with the caveat that NET_SSH1_LOG_REALTIME_FILE
-                // needs to be defined and that the resultant log file will be capped out at NET_SSH1_LOG_MAX_SIZE. 
-                // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
-                // at the beginning of the file
-                case NET_SSH1_LOG_REALTIME_FILE:
-                    if (!isset($this->realtime_log_file)) {
-                        // PHP doesn't seem to like using constants in fopen()
-                        $filename = NET_SSH2_LOG_REALTIME_FILE;
-                        $fp = fopen($filename, 'w');
-                        $this->realtime_log_file = $fp;
-                    }
-                    if (!is_resource($this->realtime_log_file)) {
-                        break;
-                    }
-                    $entry = $this->_format_log(array($message), array($protocol_flags));
-                    if ($this->realtime_log_wrap) {
-                        $temp = "<<< START >>>\r\n";
-                        $entry.= $temp;
-                        fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
-                    }
-                    $this->realtime_log_size+= strlen($entry);
-                    if ($this->realtime_log_size > NET_SSH1_LOG_MAX_SIZE) {
-                        fseek($this->realtime_log_file, 0);
-                        $this->realtime_log_size = strlen($entry);
-                        $this->realtime_log_wrap = true;
-                    }
-                    fputs($this->realtime_log_file, $entry);
-            }
+                }
+                $entry = $this->_format_log(array($message), array($protocol_flags));
+                if ($this->realtime_log_wrap) {
+                    $temp = "<<< START >>>\r\n";
+                    $entry.= $temp;
+                    fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
+                }
+                $this->realtime_log_size+= strlen($entry);
+                if ($this->realtime_log_size > NET_SSH1_LOG_MAX_SIZE) {
+                    fseek($this->realtime_log_file, 0);
+                    $this->realtime_log_size = strlen($entry);
+                    $this->realtime_log_wrap = true;
+                }
+                fputs($this->realtime_log_file, $entry);
+        }
     }
 }
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SSH2.php b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SSH2.php
index dad03697233..2fddb68a9b2 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SSH2.php
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/Net/SSH2.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * Pure-PHP implementation of SSHv2.
@@ -47,10 +46,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -59,12 +58,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @category   Net
- * @package    Net_SSH2
- * @author     Jim Wigginton <terrafrost@php.net>
- * @copyright  MMVII Jim Wigginton
- * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link       http://phpseclib.sourceforge.net
+ * @category  Net
+ * @package   Net_SSH2
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMVII Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
  */
 
 /**#@+
@@ -144,19 +143,20 @@ define('NET_SSH2_LOG_MAX_SIZE', 1024 * 1024);
 /**
  * Pure-PHP implementation of SSHv2.
  *
+ * @package Net_SSH2
  * @author  Jim Wigginton <terrafrost@php.net>
  * @version 0.1.0
  * @access  public
- * @package Net_SSH2
  */
-class Net_SSH2 {
+class Net_SSH2
+{
     /**
      * The SSH identifier
      *
      * @var String
      * @access private
      */
-    var $identifier = 'SSH-2.0-phpseclib_0.3';
+    var $identifier;
 
     /**
      * The Socket Object
@@ -748,6 +748,30 @@ class Net_SSH2 {
     var $is_timeout = false;
 
     /**
+     * Log Boundary
+     *
+     * @see Net_SSH2::_format_log
+     * @access private
+     */
+    var $log_boundary = ':';
+
+    /**
+     * Log Long Width
+     *
+     * @see Net_SSH2::_format_log
+     * @access private
+     */
+    var $log_long_width = 65;
+
+    /**
+     * Log Short Width
+     *
+     * @see Net_SSH2::_format_log
+     * @access private
+     */
+    var $log_short_width = 16;
+
+    /**
      * Default Constructor.
      *
      * Connects to an SSHv2 server
@@ -763,15 +787,15 @@ class Net_SSH2 {
         // Include Math_BigInteger
         // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.
         if (!class_exists('Math_BigInteger')) {
-            require_once('Math/BigInteger.php');
+            include_once 'Math/BigInteger.php';
         }
 
         if (!function_exists('crypt_random_string')) {
-            require_once('Crypt/Random.php');
+            include_once 'Crypt/Random.php';
         }
 
         if (!class_exists('Crypt_Hash')) {
-            require_once('Crypt/Hash.php');
+            include_once 'Crypt/Hash.php';
         }
 
         $this->last_packet = strtok(microtime(), ' ') + strtok(''); // == microtime(true) in PHP5
@@ -861,7 +885,7 @@ class Net_SSH2 {
         }
 
         $read = array($this->fsock);
-        $write = $except = NULL;
+        $write = $except = null;
 
         $sec = floor($timeout);
         $usec = 1000000 * ($timeout - $sec);
@@ -895,19 +919,7 @@ class Net_SSH2 {
             return false;
         }
 
-        $ext = array();
-        if (extension_loaded('mcrypt')) {
-            $ext[] = 'mcrypt';
-        }
-        if (extension_loaded('gmp')) {
-            $ext[] = 'gmp';
-        } else if (extension_loaded('bcmath')) {
-            $ext[] = 'bcmath';
-        }
-
-        if (!empty($ext)) {
-            $this->identifier.= ' (' . implode(', ', $ext) . ')';
-        }
+        $this->identifier = $this->_generate_identifier();
 
         if (defined('NET_SSH2_LOGGING')) {
             $this->_append_log('<-', $extra . $temp);
@@ -945,6 +957,36 @@ class Net_SSH2 {
     }
 
     /**
+     * Generates the SSH identifier
+     *
+     * You should overwrite this method in your own class if you want to use another identifier
+     *
+     * @access protected
+     * @return String
+     */
+    function _generate_identifier()
+    {
+        $identifier = 'SSH-2.0-phpseclib_0.3';
+
+        $ext = array();
+        if (extension_loaded('mcrypt')) {
+            $ext[] = 'mcrypt';
+        }
+
+        if (extension_loaded('gmp')) {
+            $ext[] = 'gmp';
+        } elseif (extension_loaded('bcmath')) {
+            $ext[] = 'bcmath';
+        }
+
+        if (!empty($ext)) {
+            $identifier .= ' (' . implode(', ', $ext) . ')';
+        }
+
+        return $identifier;
+    }
+
+    /**
      * Key Exchange
      *
      * @param String $kexinit_payload_server
@@ -1223,23 +1265,23 @@ class Net_SSH2 {
         }
 
         switch ($kex_algorithms[$i]) {
-            // see http://tools.ietf.org/html/rfc2409#section-6.2 and 
+            // see http://tools.ietf.org/html/rfc2409#section-6.2 and
             // http://tools.ietf.org/html/rfc2412, appendex E
             case 'diffie-hellman-group1-sha1':
-                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' . 
-                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' . 
-                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' . 
+                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
                          'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
                 break;
             // see http://tools.ietf.org/html/rfc3526#section-3
             case 'diffie-hellman-group14-sha1':
-                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' . 
-                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' . 
-                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' . 
-                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' . 
-                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' . 
-                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' . 
-                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' . 
+                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
                          '3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF';
                 break;
         }
@@ -1260,7 +1302,8 @@ class Net_SSH2 {
            -- http://tools.ietf.org/html/rfc4419#section-6.2 */
         $one = new Math_BigInteger(1);
         $keyLength = min($keyLength, $kexHash->getLength());
-        $max = $one->bitwise_leftShift(16 * $keyLength)->subtract($one); // 2 * 8 * $keyLength
+        $max = $one->bitwise_leftShift(16 * $keyLength); // 2 * 8 * $keyLength
+        $max = $max->subtract($one);
 
         $x = $one->random($one, $max);
         $e = $g->modPow($x, $prime);
@@ -1353,14 +1396,14 @@ class Net_SSH2 {
         switch ($encrypt) {
             case '3des-cbc':
                 if (!class_exists('Crypt_TripleDES')) {
-                    require_once('Crypt/TripleDES.php');
+                    include_once 'Crypt/TripleDES.php';
                 }
                 $this->encrypt = new Crypt_TripleDES();
                 // $this->encrypt_block_size = 64 / 8 == the default
                 break;
             case '3des-ctr':
                 if (!class_exists('Crypt_TripleDES')) {
-                    require_once('Crypt/TripleDES.php');
+                    include_once 'Crypt/TripleDES.php';
                 }
                 $this->encrypt = new Crypt_TripleDES(CRYPT_DES_MODE_CTR);
                 // $this->encrypt_block_size = 64 / 8 == the default
@@ -1369,7 +1412,7 @@ class Net_SSH2 {
             case 'aes192-cbc':
             case 'aes128-cbc':
                 if (!class_exists('Crypt_Rijndael')) {
-                    require_once('Crypt/Rijndael.php');
+                    include_once 'Crypt/Rijndael.php';
                 }
                 $this->encrypt = new Crypt_Rijndael();
                 $this->encrypt_block_size = 16; // eg. 128 / 8
@@ -1378,21 +1421,21 @@ class Net_SSH2 {
             case 'aes192-ctr':
             case 'aes128-ctr':
                 if (!class_exists('Crypt_Rijndael')) {
-                    require_once('Crypt/Rijndael.php');
+                    include_once 'Crypt/Rijndael.php';
                 }
                 $this->encrypt = new Crypt_Rijndael(CRYPT_RIJNDAEL_MODE_CTR);
                 $this->encrypt_block_size = 16; // eg. 128 / 8
                 break;
             case 'blowfish-cbc':
                 if (!class_exists('Crypt_Blowfish')) {
-                    require_once('Crypt/Blowfish.php');
+                    include_once 'Crypt/Blowfish.php';
                 }
                 $this->encrypt = new Crypt_Blowfish();
                 $this->encrypt_block_size = 8;
                 break;
             case 'blowfish-ctr':
                 if (!class_exists('Crypt_Blowfish')) {
-                    require_once('Crypt/Blowfish.php');
+                    include_once 'Crypt/Blowfish.php';
                 }
                 $this->encrypt = new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR);
                 $this->encrypt_block_size = 8;
@@ -1402,7 +1445,7 @@ class Net_SSH2 {
             case 'twofish256-cbc':
             case 'twofish-cbc':
                 if (!class_exists('Crypt_Twofish')) {
-                    require_once('Crypt/Twofish.php');
+                    include_once 'Crypt/Twofish.php';
                 }
                 $this->encrypt = new Crypt_Twofish();
                 $this->encrypt_block_size = 16;
@@ -1411,7 +1454,7 @@ class Net_SSH2 {
             case 'twofish192-ctr':
             case 'twofish256-ctr':
                 if (!class_exists('Crypt_Twofish')) {
-                    require_once('Crypt/Twofish.php');
+                    include_once 'Crypt/Twofish.php';
                 }
                 $this->encrypt = new Crypt_Twofish(CRYPT_TWOFISH_MODE_CTR);
                 $this->encrypt_block_size = 16;
@@ -1420,7 +1463,7 @@ class Net_SSH2 {
             case 'arcfour128':
             case 'arcfour256':
                 if (!class_exists('Crypt_RC4')) {
-                    require_once('Crypt/RC4.php');
+                    include_once 'Crypt/RC4.php';
                 }
                 $this->encrypt = new Crypt_RC4();
                 break;
@@ -1431,13 +1474,13 @@ class Net_SSH2 {
         switch ($decrypt) {
             case '3des-cbc':
                 if (!class_exists('Crypt_TripleDES')) {
-                    require_once('Crypt/TripleDES.php');
+                    include_once 'Crypt/TripleDES.php';
                 }
                 $this->decrypt = new Crypt_TripleDES();
                 break;
             case '3des-ctr':
                 if (!class_exists('Crypt_TripleDES')) {
-                    require_once('Crypt/TripleDES.php');
+                    include_once 'Crypt/TripleDES.php';
                 }
                 $this->decrypt = new Crypt_TripleDES(CRYPT_DES_MODE_CTR);
                 break;
@@ -1445,7 +1488,7 @@ class Net_SSH2 {
             case 'aes192-cbc':
             case 'aes128-cbc':
                 if (!class_exists('Crypt_Rijndael')) {
-                    require_once('Crypt/Rijndael.php');
+                    include_once 'Crypt/Rijndael.php';
                 }
                 $this->decrypt = new Crypt_Rijndael();
                 $this->decrypt_block_size = 16;
@@ -1454,21 +1497,21 @@ class Net_SSH2 {
             case 'aes192-ctr':
             case 'aes128-ctr':
                 if (!class_exists('Crypt_Rijndael')) {
-                    require_once('Crypt/Rijndael.php');
+                    include_once 'Crypt/Rijndael.php';
                 }
                 $this->decrypt = new Crypt_Rijndael(CRYPT_RIJNDAEL_MODE_CTR);
                 $this->decrypt_block_size = 16;
                 break;
             case 'blowfish-cbc':
                 if (!class_exists('Crypt_Blowfish')) {
-                    require_once('Crypt/Blowfish.php');
+                    include_once 'Crypt/Blowfish.php';
                 }
                 $this->decrypt = new Crypt_Blowfish();
                 $this->decrypt_block_size = 8;
                 break;
             case 'blowfish-ctr':
                 if (!class_exists('Crypt_Blowfish')) {
-                    require_once('Crypt/Blowfish.php');
+                    include_once 'Crypt/Blowfish.php';
                 }
                 $this->decrypt = new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR);
                 $this->decrypt_block_size = 8;
@@ -1478,7 +1521,7 @@ class Net_SSH2 {
             case 'twofish256-cbc':
             case 'twofish-cbc':
                 if (!class_exists('Crypt_Twofish')) {
-                    require_once('Crypt/Twofish.php');
+                    include_once 'Crypt/Twofish.php';
                 }
                 $this->decrypt = new Crypt_Twofish();
                 $this->decrypt_block_size = 16;
@@ -1487,7 +1530,7 @@ class Net_SSH2 {
             case 'twofish192-ctr':
             case 'twofish256-ctr':
                 if (!class_exists('Crypt_Twofish')) {
-                    require_once('Crypt/Twofish.php');
+                    include_once 'Crypt/Twofish.php';
                 }
                 $this->decrypt = new Crypt_Twofish(CRYPT_TWOFISH_MODE_CTR);
                 $this->decrypt_block_size = 16;
@@ -1496,7 +1539,7 @@ class Net_SSH2 {
             case 'arcfour128':
             case 'arcfour256':
                 if (!class_exists('Crypt_RC4')) {
-                    require_once('Crypt/RC4.php');
+                    include_once 'Crypt/RC4.php';
                 }
                 $this->decrypt = new Crypt_RC4();
                 break;
@@ -1647,11 +1690,27 @@ class Net_SSH2 {
      * @param Mixed $password
      * @param Mixed $...
      * @return Boolean
-     * @see _login_helper
+     * @see _login
      * @access public
      */
     function login($username)
     {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, '_login'), $args);
+    }
+
+    /**
+     * Login Helper
+     *
+     * @param String $username
+     * @param Mixed $password
+     * @param Mixed $...
+     * @return Boolean
+     * @see _login_helper
+     * @access private
+     */
+    function _login($username)
+    {
         $args = array_slice(func_get_args(), 1);
         if (empty($args)) {
             return $this->_login_helper($username);
@@ -1710,8 +1769,13 @@ class Net_SSH2 {
         }
 
         // although PHP5's get_class() preserves the case, PHP4's does not
-        if (is_object($password) && strtolower(get_class($password)) == 'crypt_rsa') {
-            return $this->_privatekey_login($username, $password);
+        if (is_object($password)) {
+            switch (strtolower(get_class($password))) {
+                case 'crypt_rsa':
+                    return $this->_privatekey_login($username, $password);
+                case 'system_ssh_agent':
+                    return $this->_ssh_agent_login($username, $password);
+            }
         }
 
         if (is_array($password)) {
@@ -1757,7 +1821,7 @@ class Net_SSH2 {
 
         // remove the username and password from the logged packet
         if (!defined('NET_SSH2_LOGGING')) {
-            $logged = NULL;
+            $logged = null;
         } else {
             $logged = pack('CNa*Na*Na*CNa*',
                 NET_SSH2_MSG_USERAUTH_REQUEST, strlen('username'), 'username', strlen('ssh-connection'), 'ssh-connection',
@@ -1821,7 +1885,7 @@ class Net_SSH2 {
      */
     function _keyboard_interactive_login($username, $password)
     {
-        $packet = pack('CNa*Na*Na*Na*Na*', 
+        $packet = pack('CNa*Na*Na*Na*Na*',
             NET_SSH2_MSG_USERAUTH_REQUEST, strlen($username), $username, strlen('ssh-connection'), 'ssh-connection',
             strlen('keyboard-interactive'), 'keyboard-interactive', 0, '', 0, ''
         );
@@ -1949,6 +2013,26 @@ class Net_SSH2 {
     }
 
     /**
+     * Login with an ssh-agent provided key
+     *
+     * @param String $username
+     * @param System_SSH_Agent $agent
+     * @return Boolean
+     * @access private
+     */
+    function _ssh_agent_login($username, $agent)
+    {
+        $keys = $agent->requestIdentities();
+        foreach ($keys as $key) {
+            if ($this->_privatekey_login($username, $key)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * Login with an RSA private key
      *
      * @param String $username
@@ -2056,7 +2140,7 @@ class Net_SSH2 {
 
     /**
      * Get the output from stdError
-     * 
+     *
      * @access public
      */
     function getStdError()
@@ -2075,7 +2159,7 @@ class Net_SSH2 {
      * @return String
      * @access public
      */
-    function exec($command, $callback = NULL)
+    function exec($command, $callback = null)
     {
         $this->curTimeout = $this->timeout;
         $this->is_timeout = false;
@@ -2086,7 +2170,7 @@ class Net_SSH2 {
         }
 
         // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
-        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but, 
+        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
         // honestly, if you're transfering more than 2GB, you probably shouldn't be using phpseclib, anyway.
         // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
         $this->window_size_server_to_client[NET_SSH2_CHANNEL_EXEC] = 0x7FFFFFFF;
@@ -2143,7 +2227,7 @@ class Net_SSH2 {
         // neither will your script.
 
         // although, in theory, the size of SSH_MSG_CHANNEL_REQUEST could exceed the maximum packet size established by
-        // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the 
+        // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the
         // "maximum size of an individual data packet". ie. SSH_MSG_CHANNEL_DATA.  RFC4254#section-5.2 corroborates.
         $packet = pack('CNNa*CNa*',
             NET_SSH2_MSG_CHANNEL_REQUEST, $this->server_channels[NET_SSH2_CHANNEL_EXEC], strlen('exec'), 'exec', 1, strlen($command), $command);
@@ -2349,7 +2433,6 @@ class Net_SSH2 {
             return false;
         }
 
-        $channel = $this->in_request_pty_exec ? NET_SSH2_CHANNEL_EXEC : NET_SSH2_CHANNEL_SHELL;
         return $this->_send_channel_packet($this->_get_interactive_channel(), $cmd);
     }
 
@@ -2430,8 +2513,7 @@ class Net_SSH2 {
      */
     function reset()
     {
-        $channel = $this->in_request_pty_exec ? NET_SSH2_CHANNEL_EXEC : NET_SSH2_CHANNEL_SHELL;
-        $this->_close_channel($channel);
+        $this->_close_channel($this->_get_interactive_channel());
     }
 
     /**
@@ -2724,7 +2806,7 @@ class Net_SSH2 {
                 }
 
                 $read = array($this->fsock);
-                $write = $except = NULL;
+                $write = $except = null;
 
                 $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
                 $sec = floor($this->curTimeout);
@@ -2801,7 +2883,7 @@ class Net_SSH2 {
                     /*
                     if ($channel == NET_SSH2_CHANNEL_EXEC) {
                         // SCP requires null packets, such as this, be sent.  further, in the case of the ssh.com SSH server
-                        // this actually seems to make things twice as fast.  more to the point, the message right after 
+                        // this actually seems to make things twice as fast.  more to the point, the message right after
                         // SSH_MSG_CHANNEL_DATA (usually SSH_MSG_IGNORE) won't block for as long as it would have otherwise.
                         // in OpenSSH it slows things down but only by a couple thousandths of a second.
                         $this->_send_channel_packet($channel, chr(0));
@@ -2861,12 +2943,9 @@ class Net_SSH2 {
                         case 'exit-status':
                             extract(unpack('Cfalse/Nexit_status', $this->_string_shift($response, 5)));
                             $this->exit_status = $exit_status;
-                            // "The channel needs to be closed with SSH_MSG_CHANNEL_CLOSE after this message."
-                            // -- http://tools.ietf.org/html/rfc4254#section-6.10
-                            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
-                            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
 
-                            $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_EOF;
+                            // "The client MAY ignore these messages."
+                            // -- http://tools.ietf.org/html/rfc4254#section-6.10
 
                             break;
                         default:
@@ -2907,7 +2986,7 @@ class Net_SSH2 {
      * @return Boolean
      * @access private
      */
-    function _send_binary_packet($data, $logged = NULL)
+    function _send_binary_packet($data, $logged = null)
     {
         if (!is_resource($this->fsock) || feof($this->fsock)) {
             user_error('Connection closed prematurely');
@@ -2967,70 +3046,70 @@ class Net_SSH2 {
      */
     function _append_log($message_number, $message)
     {
-            // remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
-            if (strlen($message_number) > 2) {
-                $this->_string_shift($message);
-            }
+        // remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
+        if (strlen($message_number) > 2) {
+            $this->_string_shift($message);
+        }
 
-            switch (NET_SSH2_LOGGING) {
-                // useful for benchmarks
-                case NET_SSH2_LOG_SIMPLE:
-                    $this->message_number_log[] = $message_number;
-                    break;
-                // the most useful log for SSH2
-                case NET_SSH2_LOG_COMPLEX:
-                    $this->message_number_log[] = $message_number;
-                    $this->log_size+= strlen($message);
-                    $this->message_log[] = $message;
-                    while ($this->log_size > NET_SSH2_LOG_MAX_SIZE) {
-                        $this->log_size-= strlen(array_shift($this->message_log));
-                        array_shift($this->message_number_log);
-                    }
-                    break;
-                // dump the output out realtime; packets may be interspersed with non packets,
-                // passwords won't be filtered out and select other packets may not be correctly
-                // identified
-                case NET_SSH2_LOG_REALTIME:
-                    switch (PHP_SAPI) {
-                        case 'cli':
-                            $start = $stop = "\r\n";
-                            break;
-                        default:
-                            $start = '<pre>';
-                            $stop = '</pre>';
-                    }
-                    echo $start . $this->_format_log(array($message), array($message_number)) . $stop;
-                    @flush();
-                    @ob_flush();
-                    break;
-                // basically the same thing as NET_SSH2_LOG_REALTIME with the caveat that NET_SSH2_LOG_REALTIME_FILE
-                // needs to be defined and that the resultant log file will be capped out at NET_SSH2_LOG_MAX_SIZE. 
-                // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
-                // at the beginning of the file
-                case NET_SSH2_LOG_REALTIME_FILE:
-                    if (!isset($this->realtime_log_file)) {
-                        // PHP doesn't seem to like using constants in fopen()
-                        $filename = NET_SSH2_LOG_REALTIME_FILENAME;
-                        $fp = fopen($filename, 'w');
-                        $this->realtime_log_file = $fp;
-                    }
-                    if (!is_resource($this->realtime_log_file)) {
+        switch (NET_SSH2_LOGGING) {
+            // useful for benchmarks
+            case NET_SSH2_LOG_SIMPLE:
+                $this->message_number_log[] = $message_number;
+                break;
+            // the most useful log for SSH2
+            case NET_SSH2_LOG_COMPLEX:
+                $this->message_number_log[] = $message_number;
+                $this->log_size+= strlen($message);
+                $this->message_log[] = $message;
+                while ($this->log_size > NET_SSH2_LOG_MAX_SIZE) {
+                    $this->log_size-= strlen(array_shift($this->message_log));
+                    array_shift($this->message_number_log);
+                }
+                break;
+            // dump the output out realtime; packets may be interspersed with non packets,
+            // passwords won't be filtered out and select other packets may not be correctly
+            // identified
+            case NET_SSH2_LOG_REALTIME:
+                switch (PHP_SAPI) {
+                    case 'cli':
+                        $start = $stop = "\r\n";
                         break;
-                    }
-                    $entry = $this->_format_log(array($message), array($message_number));
-                    if ($this->realtime_log_wrap) {
-                        $temp = "<<< START >>>\r\n";
-                        $entry.= $temp;
-                        fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
-                    }
-                    $this->realtime_log_size+= strlen($entry);
-                    if ($this->realtime_log_size > NET_SSH2_LOG_MAX_SIZE) {
-                        fseek($this->realtime_log_file, 0);
-                        $this->realtime_log_size = strlen($entry);
-                        $this->realtime_log_wrap = true;
-                    }
-                    fputs($this->realtime_log_file, $entry);
-            }
+                    default:
+                        $start = '<pre>';
+                        $stop = '</pre>';
+                }
+                echo $start . $this->_format_log(array($message), array($message_number)) . $stop;
+                @flush();
+                @ob_flush();
+                break;
+            // basically the same thing as NET_SSH2_LOG_REALTIME with the caveat that NET_SSH2_LOG_REALTIME_FILE
+            // needs to be defined and that the resultant log file will be capped out at NET_SSH2_LOG_MAX_SIZE.
+            // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
+            // at the beginning of the file
+            case NET_SSH2_LOG_REALTIME_FILE:
+                if (!isset($this->realtime_log_file)) {
+                    // PHP doesn't seem to like using constants in fopen()
+                    $filename = NET_SSH2_LOG_REALTIME_FILENAME;
+                    $fp = fopen($filename, 'w');
+                    $this->realtime_log_file = $fp;
+                }
+                if (!is_resource($this->realtime_log_file)) {
+                    break;
+                }
+                $entry = $this->_format_log(array($message), array($message_number));
+                if ($this->realtime_log_wrap) {
+                    $temp = "<<< START >>>\r\n";
+                    $entry.= $temp;
+                    fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
+                }
+                $this->realtime_log_size+= strlen($entry);
+                if ($this->realtime_log_size > NET_SSH2_LOG_MAX_SIZE) {
+                    fseek($this->realtime_log_file, 0);
+                    $this->realtime_log_size = strlen($entry);
+                    $this->realtime_log_wrap = true;
+                }
+                fputs($this->realtime_log_file, $entry);
+        }
     }
 
     /**
@@ -3103,16 +3182,19 @@ class Net_SSH2 {
      * for SCP more than anything.
      *
      * @param Integer $client_channel
+     * @param Boolean $want_reply
      * @return Boolean
      * @access private
      */
-    function _close_channel($client_channel)
+    function _close_channel($client_channel, $want_reply = false)
     {
         // see http://tools.ietf.org/html/rfc4254#section-5.3
 
         $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
 
-        $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
+        if (!$want_reply) {
+            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
+        }
 
         $this->channel_status[$client_channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
 
@@ -3120,6 +3202,10 @@ class Net_SSH2 {
 
         while (!is_bool($this->_get_channel_packet($client_channel)));
 
+        if ($want_reply) {
+            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
+        }
+
         if ($this->bitmap & NET_SSH2_MASK_SHELL) {
             $this->bitmap&= ~NET_SSH2_MASK_SHELL;
         }
@@ -3220,8 +3306,6 @@ class Net_SSH2 {
      */
     function _format_log($message_log, $message_number_log)
     {
-        static $boundary = ':', $long_width = 65, $short_width = 16;
-
         $output = '';
         for ($i = 0; $i < count($message_log); $i++) {
             $output.= $message_number_log[$i] . "\r\n";
@@ -3231,19 +3315,13 @@ class Net_SSH2 {
                 if (strlen($current_log)) {
                     $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
                 }
-                $fragment = $this->_string_shift($current_log, $short_width);
-                $hex = substr(
-                           preg_replace(
-                               '#(.)#es',
-                               '"' . $boundary . '" . str_pad(dechex(ord(substr("\\1", -1))), 2, "0", STR_PAD_LEFT)',
-                               $fragment),
-                           strlen($boundary)
-                       );
+                $fragment = $this->_string_shift($current_log, $this->log_short_width);
+                $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
                 // replace non ASCII printable characters with dots
                 // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
                 // also replace < with a . since < messes up the output on web browsers
                 $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output.= str_pad($hex, $long_width - $short_width, ' ') . $raw . "\r\n";
+                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
                 $j++;
             } while (strlen($current_log));
             $output.= "\r\n";
@@ -3253,6 +3331,20 @@ class Net_SSH2 {
     }
 
     /**
+     * Helper function for _format_log
+     *
+     * For use with preg_replace_callback()
+     *
+     * @param Array $matches
+     * @access private
+     * @return String
+     */
+    function _format_log_helper($matches)
+    {
+        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
+    }
+
+    /**
      * Returns all errors
      *
      * @return String
@@ -3505,7 +3597,7 @@ class Net_SSH2 {
                 $signature = $this->_string_shift($signature, $temp['length']);
 
                 if (!class_exists('Crypt_RSA')) {
-                    require_once('Crypt/RSA.php');
+                    include_once 'Crypt/RSA.php';
                 }
 
                 $rsa = new Crypt_RSA();
@@ -3572,7 +3664,15 @@ class Net_SSH2 {
      */
     function _is_includable($suffix)
     {
-        foreach (explode(PATH_SEPARATOR, get_include_path()) as $prefix) {
+        // stream_resolve_include_path was introduced in PHP 5.3.2
+        if (function_exists('stream_resolve_include_path')) {
+            return stream_resolve_include_path($suffix) !== false;
+        }
+
+        $paths = PATH_SEPARATOR == ':' ?
+            preg_split('#(?<!phar):#', get_include_path()) :
+            explode(PATH_SEPARATOR, get_include_path());
+        foreach ($paths as $prefix) {
             $ds = substr($prefix, -1) == DIRECTORY_SEPARATOR ? '' : DIRECTORY_SEPARATOR;
             $file = $prefix . $ds . $suffix;
 
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/System/SSH_Agent.php b/apps/files_external/3rdparty/phpseclib/phpseclib/System/SSH_Agent.php
new file mode 100644
index 00000000000..2d4c3629c37
--- /dev/null
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/System/SSH_Agent.php
@@ -0,0 +1,315 @@
+<?php
+/**
+ * Pure-PHP ssh-agent client.
+ *
+ * PHP versions 4 and 5
+ *
+ * Here are some examples of how to use this library:
+ * <code>
+ * <?php
+ *    include('System/SSH_Agent.php');
+ *    include('Net/SSH2.php');
+ *
+ *    $agent = new System_SSH_Agent();
+ *
+ *    $ssh = new Net_SSH2('www.domain.tld');
+ *    if (!$ssh->login('username', $agent)) {
+ *        exit('Login Failed');
+ *    }
+ *
+ *    echo $ssh->exec('pwd');
+ *    echo $ssh->exec('ls -la');
+ * ?>
+ * </code>
+ *
+ * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @category  System
+ * @package   System_SSH_Agent
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright MMXIV Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ * @internal  See http://api.libssh.org/rfc/PROTOCOL.agent
+ */
+
+/**#@+
+ * Message numbers
+ *
+ * @access private
+ */
+// to request SSH1 keys you have to use SSH_AGENTC_REQUEST_RSA_IDENTITIES (1)
+define('SYSTEM_SSH_AGENTC_REQUEST_IDENTITIES', 11);
+// this is the SSH2 response; the SSH1 response is SSH_AGENT_RSA_IDENTITIES_ANSWER (2).
+define('SYSTEM_SSH_AGENT_IDENTITIES_ANSWER', 12);
+define('SYSTEM_SSH_AGENT_FAILURE', 5);
+// the SSH1 request is SSH_AGENTC_RSA_CHALLENGE (3)
+define('SYSTEM_SSH_AGENTC_SIGN_REQUEST', 13);
+// the SSH1 response is SSH_AGENT_RSA_RESPONSE (4)
+define('SYSTEM_SSH_AGENT_SIGN_RESPONSE', 14);
+/**#@-*/
+
+/**
+ * Pure-PHP ssh-agent client identity object
+ *
+ * Instantiation should only be performed by System_SSH_Agent class.
+ * This could be thought of as implementing an interface that Crypt_RSA
+ * implements. ie. maybe a Net_SSH_Auth_PublicKey interface or something.
+ * The methods in this interface would be getPublicKey, setSignatureMode
+ * and sign since those are the methods phpseclib looks for to perform
+ * public key authentication.
+ *
+ * @package System_SSH_Agent
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @version 0.1.0
+ * @access  internal
+ */
+class System_SSH_Agent_Identity
+{
+    /**
+     * Key Object
+     *
+     * @var Crypt_RSA
+     * @access private
+     * @see System_SSH_Agent_Identity::getPublicKey()
+     */
+    var $key;
+
+    /**
+     * Key Blob
+     *
+     * @var String
+     * @access private
+     * @see System_SSH_Agent_Identity::sign()
+     */
+    var $key_blob;
+
+    /**
+     * Socket Resource
+     *
+     * @var Resource
+     * @access private
+     * @see System_SSH_Agent_Identity::sign()
+     */
+    var $fsock;
+
+    /**
+     * Default Constructor.
+     *
+     * @param Resource $fsock
+     * @return System_SSH_Agent_Identity
+     * @access private
+     */
+    function System_SSH_Agent_Identity($fsock)
+    {
+        $this->fsock = $fsock;
+    }
+
+    /**
+     * Set Public Key
+     *
+     * Called by System_SSH_Agent::requestIdentities()
+     *
+     * @param Crypt_RSA $key
+     * @access private
+     */
+    function setPublicKey($key)
+    {
+        $this->key = $key;
+        $this->key->setPublicKey();
+    }
+
+    /**
+     * Set Public Key
+     *
+     * Called by System_SSH_Agent::requestIdentities(). The key blob could be extracted from $this->key
+     * but this saves a small amount of computation.
+     *
+     * @param String $key_blob
+     * @access private
+     */
+    function setPublicKeyBlob($key_blob)
+    {
+        $this->key_blob = $key_blob;
+    }
+
+    /**
+     * Get Public Key
+     *
+     * Wrapper for $this->key->getPublicKey()
+     *
+     * @param Integer $format optional
+     * @return Mixed
+     * @access public
+     */
+    function getPublicKey($format = null)
+    {
+        return !isset($format) ? $this->key->getPublicKey() : $this->key->getPublicKey($format);
+    }
+
+    /**
+     * Set Signature Mode
+     *
+     * Doesn't do anything as ssh-agent doesn't let you pick and choose the signature mode. ie.
+     * ssh-agent's only supported mode is CRYPT_RSA_SIGNATURE_PKCS1
+     *
+     * @param Integer $mode
+     * @access public
+     */
+    function setSignatureMode($mode)
+    {
+    }
+
+    /**
+     * Create a signature
+     *
+     * See "2.6.2 Protocol 2 private key signature request"
+     *
+     * @param String $message
+     * @return String
+     * @access public
+     */
+    function sign($message)
+    {
+        // the last parameter (currently 0) is for flags and ssh-agent only defines one flag (for ssh-dss): SSH_AGENT_OLD_SIGNATURE
+        $packet = pack('CNa*Na*N', SYSTEM_SSH_AGENTC_SIGN_REQUEST, strlen($this->key_blob), $this->key_blob, strlen($message), $message, 0);
+        $packet = pack('Na*', strlen($packet), $packet);
+        if (strlen($packet) != fputs($this->fsock, $packet)) {
+            user_error('Connection closed during signing');
+        }
+
+        $length = current(unpack('N', fread($this->fsock, 4)));
+        $type = ord(fread($this->fsock, 1));
+        if ($type != SYSTEM_SSH_AGENT_SIGN_RESPONSE) {
+            user_error('Unable to retreive signature');
+        }
+
+        $signature_blob = fread($this->fsock, $length - 1);
+        // the only other signature format defined - ssh-dss - is the same length as ssh-rsa
+        // the + 12 is for the other various SSH added length fields
+        return substr($signature_blob, strlen('ssh-rsa') + 12);
+    }
+}
+
+/**
+ * Pure-PHP ssh-agent client identity factory
+ *
+ * requestIdentities() method pumps out System_SSH_Agent_Identity objects
+ *
+ * @package System_SSH_Agent
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @version 0.1.0
+ * @access  internal
+ */
+class System_SSH_Agent
+{
+    /**
+     * Socket Resource
+     *
+     * @var Resource
+     * @access private
+     */
+    var $fsock;
+
+    /**
+     * Default Constructor
+     *
+     * @return System_SSH_Agent
+     * @access public
+     */
+    function System_SSH_Agent()
+    {
+        switch (true) {
+            case isset($_SERVER['SSH_AUTH_SOCK']):
+                $address = $_SERVER['SSH_AUTH_SOCK'];
+                break;
+            case isset($_ENV['SSH_AUTH_SOCK']):
+                $address = $_ENV['SSH_AUTH_SOCK'];
+                break;
+            default:
+                user_error('SSH_AUTH_SOCK not found');
+                return false;
+        }
+
+        $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
+        if (!$this->fsock) {
+            user_error("Unable to connect to ssh-agent (Error $errno: $errstr)");
+        }
+    }
+
+    /**
+     * Request Identities
+     *
+     * See "2.5.2 Requesting a list of protocol 2 keys"
+     * Returns an array containing zero or more System_SSH_Agent_Identity objects
+     *
+     * @return Array
+     * @access public
+     */
+    function requestIdentities()
+    {
+        if (!$this->fsock) {
+            return array();
+        }
+
+        $packet = pack('NC', 1, SYSTEM_SSH_AGENTC_REQUEST_IDENTITIES);
+        if (strlen($packet) != fputs($this->fsock, $packet)) {
+            user_error('Connection closed while requesting identities');
+        }
+
+        $length = current(unpack('N', fread($this->fsock, 4)));
+        $type = ord(fread($this->fsock, 1));
+        if ($type != SYSTEM_SSH_AGENT_IDENTITIES_ANSWER) {
+            user_error('Unable to request identities');
+        }
+
+        $identities = array();
+        $keyCount = current(unpack('N', fread($this->fsock, 4)));
+        for ($i = 0; $i < $keyCount; $i++) {
+            $length = current(unpack('N', fread($this->fsock, 4)));
+            $key_blob = fread($this->fsock, $length);
+            $length = current(unpack('N', fread($this->fsock, 4)));
+            $key_comment = fread($this->fsock, $length);
+            $length = current(unpack('N', substr($key_blob, 0, 4)));
+            $key_type = substr($key_blob, 4, $length);
+            switch ($key_type) {
+                case 'ssh-rsa':
+                    if (!class_exists('Crypt_RSA')) {
+                        include_once 'Crypt/RSA.php';
+                    }
+                    $key = new Crypt_RSA();
+                    $key->loadKey('ssh-rsa ' . base64_encode($key_blob) . ' ' . $key_comment);
+                    break;
+                case 'ssh-dss':
+                    // not currently supported
+                    break;
+            }
+            // resources are passed by reference by default
+            if (isset($key)) {
+                $identity = new System_SSH_Agent_Identity($this->fsock);
+                $identity->setPublicKey($key);
+                $identity->setPublicKeyBlob($key_blob);
+                $identities[] = $identity;
+                unset($key);
+            }
+        }
+
+        return $identities;
+    }
+}
diff --git a/apps/files_external/3rdparty/phpseclib/phpseclib/openssl.cnf b/apps/files_external/3rdparty/phpseclib/phpseclib/openssl.cnf
index 6baa566102c..2b8b52f9f7f 100644
--- a/apps/files_external/3rdparty/phpseclib/phpseclib/openssl.cnf
+++ b/apps/files_external/3rdparty/phpseclib/phpseclib/openssl.cnf
@@ -3,4 +3,4 @@
 HOME			= .
 RANDFILE		= $ENV::HOME/.rnd
 
-[ v3_ca ]
\ No newline at end of file
+[ v3_ca ]
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php
index 656930514f0..e325506fa14 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,8 +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)
-# Addition 17/03/2014 Robin McCorkell (rmccorkell@karoshi.org.uk)
 # On the official website http://www.phpclasses.org/smb4php the
 # license is listed as LGPL so we assume that this is
 # dual-licensed GPL/LGPL
@@ -44,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) {
@@ -75,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) {
-
-		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 client ($params, $purl, $regexp = NULL) {
+
+		if ($regexp === NULL) $regexp = smb::$regexp;
 
 		if (SMB4PHP_AUTHMODE == 'env') {
 			putenv("USER={$purl['user']}%{$purl['pass']}");
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 5b1cd86a170..0017b22caad 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,140 @@ 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');
 
+OC_Mount_Config::registerBackend('\OC\Files\Storage\Local', array(
+	'backend' => 'Local',
+	'configuration' => array(
+		'datadir' => 'Location')));
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
+	'backend' => 'Amazon S3',
+	'configuration' => array(
+		'key' => 'Key',
+		'secret' => '*Secret',
+		'bucket' => 'Bucket'),
+	'has_dependencies' => true));
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
+	'backend' => 'Amazon S3 and compliant',
+	'configuration' => array(
+		'key' => 'Access Key',
+		'secret' => '*Secret Key',
+		'bucket' => 'Bucket',
+		'hostname' => '&Hostname (optional)',
+		'port' => '&Port (optional)',
+		'region' => '&Region (optional)',
+		'use_ssl' => '!Enable SSL',
+		'use_path_style' => '!Enable Path Style'),
+	'has_dependencies' => true));
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
+	'backend' => 'Dropbox',
+	'configuration' => array(
+		'configured' => '#configured',
+		'app_key' => 'App key',
+		'app_secret' => '*App secret',
+		'token' => '#token',
+		'token_secret' => '#token_secret'),
+	'custom' => 'dropbox',
+	'has_dependencies' => true));
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array(
+	'backend' => 'FTP',
+	'configuration' => array(
+		'host' => 'URL',
+		'user' => 'Username',
+		'password' => '*Password',
+		'root' => '&Root',
+		'secure' => '!Secure ftps://'),
+	'has_dependencies' => true));
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', array(
+	'backend' => 'Google Drive',
+	'configuration' => array(
+		'configured' => '#configured',
+		'client_id' => 'Client ID',
+		'client_secret' => '*Client secret',
+		'token' => '#token'),
+	'custom' => 'google',
+	'has_dependencies' => true));
+
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array(
+	'backend' => 'OpenStack Object Storage',
+	'configuration' => array(
+		'user' => 'Username (required)',
+		'bucket' => 'Bucket (required)',
+		'region' => '&Region (optional for OpenStack Object Storage)',
+		'key' => '*API Key (required for Rackspace Cloud Files)',
+		'tenant' => '&Tenantname (required for OpenStack Object Storage)',
+		'password' => '*Password (required for OpenStack Object Storage)',
+		'service_name' => '&Service Name (required for OpenStack Object Storage)',
+		'url' => '&URL of identity endpoint (required for OpenStack Object Storage)',
+		'timeout' => '&Timeout of HTTP requests in seconds (optional)',
+	),
+	'has_dependencies' => true));
+
+
+if (!OC_Util::runningOnWindows()) {
+	OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', array(
+		'backend' => 'SMB / CIFS',
+		'configuration' => array(
+			'host' => 'URL',
+			'user' => 'Username',
+			'password' => '*Password',
+			'share' => 'Share',
+			'root' => '&Root'),
+		'has_dependencies' => true));
+
+	OC_Mount_Config::registerBackend('\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'),
+		'has_dependencies' => true));
+}
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', array(
+	'backend' => 'WebDAV',
+	'configuration' => array(
+		'host' => 'URL',
+		'user' => 'Username',
+		'password' => '*Password',
+		'root' => '&Root',
+		'secure' => '!Secure https://'),
+	'has_dependencies' => true));
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', array(
+	'backend' => 'ownCloud',
+	'configuration' => array(
+		'host' => 'URL',
+		'user' => 'Username',
+		'password' => '*Password',
+		'root' => '&Remote subfolder',
+		'secure' => '!Secure https://')));
+
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', array(
+	'backend' => 'SFTP',
+	'configuration' => array(
+		'host' => 'URL',
+		'user' => 'Username',
+		'password' => '*Password',
+		'root' => '&Root')));
+
+OC_Mount_Config::registerBackend('\OC\Files\Storage\iRODS', array(
+	'backend' => 'iRODS',
+	'configuration' => array(
+		'host' => 'Host',
+		'port' => 'Port',
+		'use_logon_credentials' => '!Use ownCloud login',
+		'user' => 'Username',
+		'password' => '*Password',
+		'auth_mode' => 'Authentication Mode',
+		'zone' => 'Zone')));
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 11aeb10184b..1d3489f7f57 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 cd2a3103eb7..00793a614c2 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) {
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index 338526d2afd..5fd4e4c398c 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/ast.php b/apps/files_external/l10n/ast.php
new file mode 100644
index 00000000000..7061cffaa8e
--- /dev/null
+++ b/apps/files_external/l10n/ast.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"Folder name" => "Nome de la carpeta",
+"Options" => "Opciones",
+"Groups" => "Grupos",
+"Users" => "Usuarios",
+"Delete" => "Desaniciar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
index d59a4b8c80b..118da27f74a 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -6,8 +6,6 @@ $TRANSLATIONS = array(
 "Folder name" => "Име на папката",
 "Configuration" => "Конфигурация",
 "Options" => "Опции",
-"Applicable" => "Приложимо",
-"None set" => "Няма избрано",
 "All Users" => "Всички потребители",
 "Groups" => "Групи",
 "Users" => "Потребители",
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 065d61acfca..6c8f5777958 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -8,8 +8,6 @@ $TRANSLATIONS = array(
 "External Storage" => "বাহ্যিক সংরক্ষণাগার",
 "Configuration" => "কনফিগারেসন",
 "Options" => "বিকল্পসমূহ",
-"Applicable" => "প্রযোজ্য",
-"None set" => "কোনটিই নির্ধারণ করা হয় নি",
 "All Users" => "সমস্ত ব্যবহারকারী",
 "Groups" => "গোষ্ঠীসমূহ",
 "Users" => "ব্যবহারকারী",
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index 3e722046296..50b6f55231b 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -6,17 +6,12 @@ $TRANSLATIONS = array(
 "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.",
 "External Storage" => "Emmagatzemament extern",
 "Folder name" => "Nom de la carpeta",
 "External storage" => "Emmagatzemament extern",
 "Configuration" => "Configuració",
 "Options" => "Options",
-"Applicable" => "Aplicable",
 "Add storage" => "Afegeix emmagatzemament",
-"None set" => "Cap d'establert",
 "All Users" => "Tots els usuaris",
 "Groups" => "Grups",
 "Users" => "Usuaris",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 2f7bbd0c4a3..6a4e09aa3ab 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -6,23 +6,18 @@ $TRANSLATIONS = array(
 "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.",
 "External Storage" => "Externí úložiště",
 "Folder name" => "Název složky",
 "External storage" => "Externí úložiště",
 "Configuration" => "Nastavení",
 "Options" => "Možnosti",
-"Applicable" => "Přístupný pro",
 "Add storage" => "Přidat úložiště",
-"None set" => "Nenastaveno",
 "All Users" => "Všichni uživatelé",
 "Groups" => "Skupiny",
 "Users" => "Uživatelé",
 "Delete" => "Smazat",
 "Enable User External Storage" => "Zapnout externí uživatelské úložiště",
-"Allow users to mount the following external storage" => "Povolit uživatelů připojit externí úložiště",
+"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 dd65213b9ab..e0dea75303e 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -5,22 +5,19 @@ $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",
-"<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. ",
+"Saved" => "Gemt",
 "External Storage" => "Ekstern opbevaring",
 "Folder name" => "Mappenavn",
 "External storage" => "Eksternt lager",
 "Configuration" => "Opsætning",
 "Options" => "Valgmuligheder",
-"Applicable" => "Kan anvendes",
 "Add storage" => "Tilføj lager",
-"None set" => "Ingen sat",
 "All Users" => "Alle brugere",
 "Groups" => "Grupper",
 "Users" => "Brugere",
 "Delete" => "Slet",
 "Enable User External Storage" => "Aktiver ekstern opbevaring for brugere",
+"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 a78728b4c20..25c7ffb3af1 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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. ",
+"<b>Note:</b> " => "<b>Hinweis:</b> ",
+" and " => "und",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
 "External Storage" => "Externer Speicher",
 "Folder name" => "Ordnername",
 "External storage" => "Externer Speicher",
 "Configuration" => "Konfiguration",
 "Options" => "Optionen",
-"Applicable" => "Zutreffend",
+"Available for" => "Verfügbar für",
 "Add storage" => "Speicher hinzufügen",
-"None set" => "Nicht definiert",
+"No user or group" => "Kein Nutzer oder Gruppe",
 "All Users" => "Alle Benutzer",
 "Groups" => "Gruppen",
 "Users" => "Benutzer",
diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php
index 8a13c7cdd57..554fca8de54 100644
--- a/apps/files_external/l10n/de_CH.php
+++ b/apps/files_external/l10n/de_CH.php
@@ -5,17 +5,12 @@ $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",
-"<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.",
 "External Storage" => "Externer Speicher",
 "Folder name" => "Ordnername",
 "External storage" => "Externer Speicher",
 "Configuration" => "Konfiguration",
 "Options" => "Optionen",
-"Applicable" => "Zutreffend",
 "Add storage" => "Speicher hinzufügen",
-"None set" => "Nicht definiert",
 "All Users" => "Alle Benutzer",
 "Groups" => "Gruppen",
 "Users" => "Benutzer",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 5ffe946c699..186aa5a299a 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Hinweis:</b> ",
+" and " => "und",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
 "External Storage" => "Externer Speicher",
 "Folder name" => "Ordnername",
 "External storage" => "Externer Speicher",
 "Configuration" => "Konfiguration",
 "Options" => "Optionen",
-"Applicable" => "Zutreffend",
+"Available for" => "Verfügbar für",
 "Add storage" => "Speicher hinzufügen",
-"None set" => "Nicht definiert",
+"No user or group" => "Kein Nutzer oder Gruppe",
 "All Users" => "Alle Benutzer",
 "Groups" => "Gruppen",
 "Users" => "Benutzer",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 4dcd93d7ac8..16b837e24c5 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -6,22 +6,18 @@ $TRANSLATIONS = array(
 "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 δεν είναι δυνατή. Παρακαλώ ρωτήστε τον διαχειριστλη του συστήματος για την εγκατάσταση. ",
 "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 root",
 "Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root"
 );
diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php
index f7fdbf2f0d1..4bd3f9daf2a 100644
--- a/apps/files_external/l10n/en_GB.php
+++ b/apps/files_external/l10n/en_GB.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Note:</b> ",
+" and " => " and ",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
 "External Storage" => "External Storage",
 "Folder name" => "Folder name",
 "External storage" => "External storage",
 "Configuration" => "Configuration",
 "Options" => "Options",
-"Applicable" => "Applicable",
+"Available for" => "Available for",
 "Add storage" => "Add storage",
-"None set" => "None set",
+"No user or group" => "No user or group",
 "All Users" => "All Users",
 "Groups" => "Groups",
 "Users" => "Users",
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index aba16e2efa8..5312872c07a 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -9,8 +9,6 @@ $TRANSLATIONS = array(
 "Folder name" => "Dosierujnomo",
 "Configuration" => "Agordo",
 "Options" => "Malneproj",
-"Applicable" => "Aplikebla",
-"None set" => "Nenio agordita",
 "All Users" => "Ĉiuj uzantoj",
 "Groups" => "Grupoj",
 "Users" => "Uzantoj",
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index ea831c947f4..bfe542c6e71 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Nota:</b> ",
+" and " => "y",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
 "Folder name" => "Nombre de la carpeta",
 "External storage" => "Almacenamiento externo",
 "Configuration" => "Configuración",
 "Options" => "Opciones",
-"Applicable" => "Aplicable",
+"Available for" => "Disponible para",
 "Add storage" => "Añadir almacenamiento",
-"None set" => "No se ha configurado",
+"No user or group" => "Ningún usuario o grupo",
 "All Users" => "Todos los usuarios",
 "Groups" => "Grupos",
 "Users" => "Usuarios",
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index 05204b748c4..f184dbdb7d8 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "Permitir acceso",
 "Please provide a valid Dropbox app key and secret." => "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
 "Error configuring Google Drive storage" => "Error al configurar el almacenamiento de Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb \"smbclient\" no está instalado. Montar archivos CIFS/SMB no es posible. Por favor, pedile al administrador de tu sistema que lo instale.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de FTP en PHP no está instalado. Montar archivos FTP no es posible. Por favor, pedile al administrador de tu sistema que lo instale.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de Curl de PHP no está activo ni instalado. Montar servicios ownCloud, WebDAV y/o GoogleDrive no será posible. Pedile al administrador del sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
 "Folder name" => "Nombre de la carpeta",
 "External storage" => "Almacenamiento externo",
 "Configuration" => "Configuración",
 "Options" => "Opciones",
-"Applicable" => "Aplicable",
 "Add storage" => "Añadir almacenamiento",
-"None set" => "No fue configurado",
 "All Users" => "Todos los usuarios",
 "Groups" => "Grupos",
 "Users" => "Usuarios",
diff --git a/apps/files_external/l10n/es_MX.php b/apps/files_external/l10n/es_MX.php
index 5d3fd44bec6..dc0aef45c4f 100644
--- a/apps/files_external/l10n/es_MX.php
+++ b/apps/files_external/l10n/es_MX.php
@@ -5,17 +5,12 @@ $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",
-"<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 \"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.",
-"<b>Warning:</b> The 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 carpetas 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.",
 "External Storage" => "Almacenamiento externo",
 "Folder name" => "Nombre de la carpeta",
 "External storage" => "Almacenamiento externo",
 "Configuration" => "Configuración",
 "Options" => "Opciones",
-"Applicable" => "Aplicable",
 "Add storage" => "Añadir almacenamiento",
-"None set" => "No se ha configurado",
 "All Users" => "Todos los usuarios",
 "Groups" => "Grupos",
 "Users" => "Usuarios",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index c6450f95e18..0589d9fd518 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -5,22 +5,21 @@ $TRANSLATIONS = array(
 "Grant access" => "Anna ligipääs",
 "Please provide a valid Dropbox app key and secret." => "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
 "Error configuring Google Drive storage" => "Viga Google Drive'i salvestusruumi seadistamisel",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Hoiatus:</b> \"smbclient\" pole paigaldatud. Jagatud CIFS/SMB hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata SAMBA tugi.",
-"<b>Warning:</b> The 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>Hoiatus:</b> PHP-s puudub FTP tugi. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
-"<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>Hoiatus:</b> PHP-s puudub Curl tugi. Jagatud ownCloud / WebDAV või GoogleDrive ühendamine pole võimalik. Palu oma süsteemihalduril see paigaldada.",
+"Saved" => "Salvestatud",
 "External Storage" => "Väline salvestuskoht",
 "Folder name" => "Kausta nimi",
 "External storage" => "Väline andmehoidla",
 "Configuration" => "Seadistamine",
 "Options" => "Valikud",
-"Applicable" => "Rakendatav",
+"Available for" => "Saadaval",
 "Add storage" => "Lisa andmehoidla",
-"None set" => "Pole määratud",
+"No user or group" => "Ühtki kasutajat või gruppi",
 "All Users" => "Kõik kasutajad",
 "Groups" => "Grupid",
 "Users" => "Kasutajad",
 "Delete" => "Kustuta",
 "Enable User External Storage" => "Luba kasutajatele väline salvestamine",
+"Allow users to mount the following external storage" => "Võimalda kasutajatel ühendada järgmist välist andmehoidlat",
 "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 bdc5cf56760..c2111a1f736 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "Baimendu sarrera",
 "Please provide a valid Dropbox app key and secret." => "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
 "Error configuring Google Drive storage" => "Errore bat egon da Google Drive biltegiratzea konfiguratzean",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.",
-"<b>Warning:</b> The 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>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.",
-"<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>Abisua:</b> Curl euskarri PHP modulua ez dago instalatuta edo gaitua. Ezinezko da ownCloud /WebDAV GoogleDrive-n muntatzea. Mesedez eskatu sistema kudeatzaileari instala dezan. ",
 "External Storage" => "Kanpoko Biltegiratzea",
 "Folder name" => "Karpetaren izena",
 "External storage" => "Kanpoko biltegiratzea",
 "Configuration" => "Konfigurazioa",
 "Options" => "Aukerak",
-"Applicable" => "Aplikagarria",
 "Add storage" => "Gehitu biltegiratzea",
-"None set" => "Ezarri gabe",
 "All Users" => "Erabiltzaile guztiak",
 "Groups" => "Taldeak",
 "Users" => "Erabiltzaileak",
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 544b8a14d5c..74472c54bf5 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => " مجوز اعطا دسترسی",
 "Please provide a valid Dropbox app key and secret." => "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید.",
 "Error configuring Google Drive storage" => "خطا به هنگام تنظیم فضای Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "خطا: \"smbclient\" نصب نشده است. نصب و راه اندازی سهام  CIFS/SMB امکان پذیر نمیباشد. لطفا از مدیریت سازمان خود برای راه اندازی آن درخواست نمایید.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "خطا: پشتیبانی FTP در PHP فعال نمی باشد یا نصب نشده است. نصب و راه اندازی از سهم های FTP امکان پذیر نمی باشد. لطفا از مدیر سیستم خود برای راه اندازی آن درخواست\nکنید.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "خطا: پشتیبانی Curl  فعال نمی باشد یا نصب نشده است. نصب و راه اندازی  ownCloud / WebDAV یا GoogleDrive امکان پذیر نیست. لطفا از مدیر سیستم خود برای نصب آن درخواست کنید.",
 "External Storage" => "حافظه خارجی",
 "Folder name" => "نام پوشه",
 "External storage" => "حافظه خارجی",
 "Configuration" => "پیکربندی",
 "Options" => "تنظیمات",
-"Applicable" => "قابل اجرا",
 "Add storage" => "اضافه کردن حافظه",
-"None set" => "تنظیم نشده",
 "All Users" => "تمام کاربران",
 "Groups" => "گروه ها",
 "Users" => "کاربران",
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index d2f9d1a73a5..677425d8a6a 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Huomio:</b> ",
+" and " => "ja",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
 "External Storage" => "Erillinen tallennusväline",
 "Folder name" => "Kansion nimi",
 "External storage" => "Ulkoinen tallennustila",
 "Configuration" => "Asetukset",
 "Options" => "Valinnat",
-"Applicable" => "Sovellettavissa",
+"Available for" => "Saatavuus",
 "Add storage" => "Lisää tallennustila",
-"None set" => "Ei asetettu",
+"No user or group" => "Ei käyttäjää tai ryhmää",
 "All Users" => "Kaikki käyttäjät",
 "Groups" => "Ryhmät",
 "Users" => "Käyttäjät",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index 4b8e2b905b6..8ff19697182 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Attention :</b>",
+" and " => "et",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s 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 de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
 "External Storage" => "Stockage externe",
 "Folder name" => "Nom du dossier",
 "External storage" => "Stockage externe",
 "Configuration" => "Configuration",
 "Options" => "Options",
-"Applicable" => "Disponible",
+"Available for" => "Disponible pour",
 "Add storage" => "Ajouter un support de stockage",
-"None set" => "Aucun spécifié",
+"No user or group" => "Aucun utilisateur ou groupe",
 "All Users" => "Tous les utilisateurs",
 "Groups" => "Groupes",
 "Users" => "Utilisateurs",
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index ec13fe241f6..5efa6ce6028 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Nota:</b> ",
+" and " => "e",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
 "External Storage" => "Almacenamento externo",
 "Folder name" => "Nome do cartafol",
 "External storage" => "Almacenamento externo",
 "Configuration" => "Configuración",
 "Options" => "Opcións",
-"Applicable" => "Aplicábel",
+"Available for" => "Dispoñíbel para",
 "Add storage" => "Engadir almacenamento",
-"None set" => "Ningún definido",
+"No user or group" => "Non hai usuario ou grupo",
 "All Users" => "Todos os usuarios",
 "Groups" => "Grupos",
 "Users" => "Usuarios",
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
index 6aec07e78cf..e433f4fc306 100644
--- a/apps/files_external/l10n/he.php
+++ b/apps/files_external/l10n/he.php
@@ -9,8 +9,6 @@ $TRANSLATIONS = array(
 "Folder name" => "שם התיקייה",
 "Configuration" => "הגדרות",
 "Options" => "אפשרויות",
-"Applicable" => "ניתן ליישום",
-"None set" => "לא הוגדרה",
 "All Users" => "כל המשתמשים",
 "Groups" => "קבוצות",
 "Users" => "משתמשים",
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index 60661380433..39d185d5f0b 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "Megadom a hozzáférést",
 "Please provide a valid Dropbox app key and secret." => "Adjon meg egy érvényes Dropbox app key-t és secretet!",
 "Error configuring Google Drive storage" => "A Google Drive tárolót nem sikerült beállítani",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<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.",
-"<b>Warning:</b> The 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>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.",
-"<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>Figyelmeztetés:</b> A PHP-ben nincs telepítve vagy engedélyezve a Curl támogatás. Nem lehetséges ownCloud / WebDAV ill. GoogleDrive tárolók becsatolása. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot!",
 "External Storage" => "Külső tárolási szolgáltatások becsatolása",
 "Folder name" => "Mappanév",
 "External storage" => "Külső tárolók",
 "Configuration" => "Beállítások",
 "Options" => "Opciók",
-"Applicable" => "Érvényességi kör",
 "Add storage" => "Tároló becsatolása",
-"None set" => "Nincs beállítva",
 "All Users" => "Az összes felhasználó",
 "Groups" => "Csoportok",
 "Users" => "Felhasználók",
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 9f91fdf992f..8ab5069539f 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -5,16 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "Berikan hak akses",
 "Please provide a valid Dropbox app key and secret." => "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
 "Error configuring Google Drive storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.",
-"<b>Warning:</b> The 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>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.",
 "External Storage" => "Penyimpanan Eksternal",
 "Folder name" => "Nama folder",
 "External storage" => "Penyimpanan eksternal",
 "Configuration" => "Konfigurasi",
 "Options" => "Opsi",
-"Applicable" => "Berlaku",
 "Add storage" => "Tambahkan penyimpanan",
-"None set" => "Tidak satupun di set",
 "All Users" => "Semua Pengguna",
 "Groups" => "Grup",
 "Users" => "Pengguna",
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
index e86cfa108a6..21a215807ab 100644
--- a/apps/files_external/l10n/is.php
+++ b/apps/files_external/l10n/is.php
@@ -5,14 +5,10 @@ $TRANSLATIONS = array(
 "Grant access" => "Veita aðgengi",
 "Please provide a valid Dropbox app key and secret." => "Gefðu upp virkan Dropbox lykil og leynikóða",
 "Error configuring Google Drive storage" => "Villa kom upp við að setja upp Google Drive gagnasvæði",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<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.",
-"<b>Warning:</b> The 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>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.",
 "External Storage" => "Ytri gagnageymsla",
 "Folder name" => "Nafn möppu",
 "Configuration" => "Uppsetning",
 "Options" => "Stillingar",
-"Applicable" => "Gilt",
-"None set" => "Ekkert sett",
 "All Users" => "Allir notendur",
 "Groups" => "Hópar",
 "Users" => "Notendur",
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index d62d8e97327..f3a6f9af129 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Nota:</b>",
+" and " => "e",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
 "External Storage" => "Archiviazione esterna",
 "Folder name" => "Nome della cartella",
 "External storage" => "Archiviazione esterna",
 "Configuration" => "Configurazione",
 "Options" => "Opzioni",
-"Applicable" => "Applicabile",
+"Available for" => "Disponibile per",
 "Add storage" => "Aggiungi archiviazione",
-"None set" => "Nessuna impostazione",
+"No user or group" => "Nessun utente o gruppo",
 "All Users" => "Tutti gli utenti",
 "Groups" => "Gruppi",
 "Users" => "Utenti",
diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php
index 312dc85188d..52d66043e19 100644
--- a/apps/files_external/l10n/ja.php
+++ b/apps/files_external/l10n/ja.php
@@ -6,17 +6,13 @@ $TRANSLATIONS = array(
 "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" => "未設定",
+"No user or group" => "ユーザーもしくはグループがありません",
 "All Users" => "すべてのユーザー",
 "Groups" => "グループ",
 "Users" => "ユーザー",
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
index 4953f91ce6a..d68dae88c02 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "დაშვების მინიჭება",
 "Please provide a valid Dropbox app key and secret." => "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
 "Error configuring Google Drive storage" => "შეცდომა Google Drive საცავის კონფიგურირების დროს",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>გაფრთხილება:</b> \"smbclient\" არ არის ინსტალირებული. CIFS/SMB ზიარების მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>გაფრთხილება:</b>  FTP მხარდაჭერა არ არის აქტიური ან დაინსტალირებული. 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" => "მომხმარებელი",
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 088a419e1c1..371cba3e12d 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "접근 권한 부여",
 "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, Google 드라이브 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "External Storage" => "외부 저장소",
 "Folder name" => "폴더 이름",
 "External storage" => "외부 저장소",
 "Configuration" => "설정",
 "Options" => "옵션",
-"Applicable" => "적용 가능",
 "Add storage" => "저장소 추가",
-"None set" => "설정되지 않음",
 "All Users" => "모든 사용자",
 "Groups" => "그룹",
 "Users" => "사용자",
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index c96119c8b68..fdf1ee70136 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "Suteikti priėjimą",
 "Please provide a valid Dropbox app key and secret." => "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
 "Error configuring Google Drive storage" => "Klaida nustatinėjant Google Drive talpyklą",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<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\"",
-"<b>Warning:</b> The 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>Į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. ",
-"<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>Įspėjimas:</b> \"Curl\" palaikymas PHP terpėje nėra įjungtas arba įdiegtas. ownCloud/WebDAV ar GoogleDrive įjungimas nebus įmanomas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas arba įjungtas \"Curl\" palaikymas.",
 "External Storage" => "Išorinės saugyklos",
 "Folder name" => "Katalogo pavadinimas",
 "External storage" => "Išorinė saugykla",
 "Configuration" => "Konfigūracija",
 "Options" => "Nustatymai",
-"Applicable" => "Pritaikyti",
 "Add storage" => "Pridėti saugyklą",
-"None set" => "Nieko nepasirinkta",
 "All Users" => "Visi vartotojai",
 "Groups" => "Grupės",
 "Users" => "Vartotojai",
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index 18e56178892..e1037b50328 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "Piešķirt pieeju",
 "Please provide a valid Dropbox app key and secret." => "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
 "Error configuring Google Drive storage" => "Kļūda, konfigurējot Google Drive krātuvi",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<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ē.",
-"<b>Warning:</b> The 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>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ē.",
-"<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>Brīdinājums:</b> PHP Curl atbalsts nav instalēts.  OwnCloud / WebDAV vai GoogleDrive montēšana nav iespējama. Lūdziet sistēmas administratoram lai tas tiek uzstādīts.",
 "External Storage" => "Ārējā krātuve",
 "Folder name" => "Mapes nosaukums",
 "External storage" => "Ārējā krātuve",
 "Configuration" => "Konfigurācija",
 "Options" => "Opcijas",
-"Applicable" => "Piemērojams",
 "Add storage" => "Pievienot krātuvi",
-"None set" => "Neviens nav iestatīts",
 "All Users" => "Visi lietotāji",
 "Groups" => "Grupas",
 "Users" => "Lietotāji",
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index b59bb138f1d..507c0a74559 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -5,14 +5,10 @@ $TRANSLATIONS = array(
 "Grant access" => "Дозволи пристап",
 "Please provide a valid Dropbox app key and secret." => "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
 "Error configuring Google Drive storage" => "Грешка при конфигурација на Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не е инсталиран. Не е можно монтирање на CIFS/SMB дискови. Замолете го Вашиот систем администратор да го инсталира.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Не е овозможена или инсталирани FTP подршка во PHP. Не е можно монтирање на FTP дискови. Замолете го Вашиот систем администратор да го инсталира.",
 "External Storage" => "Надворешно складиште",
 "Folder name" => "Име на папка",
 "Configuration" => "Конфигурација",
 "Options" => "Опции",
-"Applicable" => "Применливо",
-"None set" => "Ништо поставено",
 "All Users" => "Сите корисници",
 "Groups" => "Групи",
 "Users" => "Корисници",
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index c103112dbe3..95c9b47f412 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -5,17 +5,13 @@ $TRANSLATIONS = array(
 "Grant access" => "Gi tilgang",
 "Please provide a valid Dropbox app key and secret." => "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
 "Error configuring Google Drive storage" => "Feil med konfigurering av Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å 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 støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere 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> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det.",
+"Saved" => "Lagret",
 "External Storage" => "Ekstern lagring",
 "Folder name" => "Mappenavn",
 "External storage" => "Ekstern lagringsplass",
 "Configuration" => "Konfigurasjon",
 "Options" => "Innstillinger",
-"Applicable" => "Anvendelig",
 "Add storage" => "Legg til lagringsplass",
-"None set" => "Ingen valgt",
 "All Users" => "Alle brukere",
 "Groups" => "Grupper",
 "Users" => "Brukere",
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index 4fa579775f9..c055be50f87 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Let op:</b> ",
+" and " => "en",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.",
 "External Storage" => "Externe opslag",
 "Folder name" => "Mapnaam",
 "External storage" => "Externe opslag",
 "Configuration" => "Configuratie",
 "Options" => "Opties",
-"Applicable" => "Van toepassing",
+"Available for" => "Beschikbaar voor",
 "Add storage" => "Toevoegen opslag",
-"None set" => "Niets ingesteld",
+"No user or group" => "Geen gebruiker of groep",
 "All Users" => "Alle gebruikers",
 "Groups" => "Groepen",
 "Users" => "Gebruikers",
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index ece0620f754..246e12b6ac8 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Uwaga:</b> ",
+" and " => "oraz",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
 "External Storage" => "Zewnętrzna zasoby dyskowe",
 "Folder name" => "Nazwa folderu",
 "External storage" => "Zewnętrzne zasoby dyskowe",
 "Configuration" => "Konfiguracja",
 "Options" => "Opcje",
-"Applicable" => "Zastosowanie",
+"Available for" => "Dostępne przez",
 "Add storage" => "Dodaj zasoby dyskowe",
-"None set" => "Nie ustawione",
+"No user or group" => "Brak użytkownika lub grupy",
 "All Users" => "Wszyscy uzytkownicy",
 "Groups" => "Grupy",
 "Users" => "Użytkownicy",
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index fbb945c5439..9a5a39f2358 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Nota:</b>",
+" and " => "e",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
 "External Storage" => "Armazenamento Externo",
 "Folder name" => "Nome da pasta",
 "External storage" => "Armazenamento Externo",
 "Configuration" => "Configuração",
 "Options" => "Opções",
-"Applicable" => "Aplicável",
+"Available for" => "Disponível para",
 "Add storage" => "Adicionar Armazenamento",
-"None set" => "Nenhum definido",
+"No user or group" => "Nenhum usuário ou grupo",
 "All Users" => "Todos os Usuários",
 "Groups" => "Grupos",
 "Users" => "Usuários",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index e331d55726b..d0b70006ea1 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -6,22 +6,18 @@ $TRANSLATIONS = array(
 "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.",
 "External Storage" => "Armazenamento Externo",
 "Folder name" => "Nome da pasta",
 "External storage" => "Armazenamento Externo",
 "Configuration" => "Configuração",
 "Options" => "Opções",
-"Applicable" => "Aplicável",
 "Add storage" => "Adicionar armazenamento",
-"None set" => "Não definido",
 "All Users" => "Todos os utilizadores",
 "Groups" => "Grupos",
 "Users" => "Utilizadores",
 "Delete" => "Eliminar",
 "Enable User External Storage" => "Activar Armazenamento Externo para o Utilizador",
+"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 a90b0299e17..3fc56c67d33 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -6,17 +6,12 @@ $TRANSLATIONS = array(
 "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!",
 "External Storage" => "Stocare externă",
 "Folder name" => "Denumire director",
 "External storage" => "Stocare externă",
 "Configuration" => "Configurație",
 "Options" => "Opțiuni",
-"Applicable" => "Aplicabil",
 "Add storage" => "Adauga stocare",
-"None set" => "Niciunul",
 "All Users" => "Toți utilizatorii",
 "Groups" => "Grupuri",
 "Users" => "Utilizatori",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index 66d6f9fa6b8..f282f3969e5 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -5,22 +5,19 @@ $TRANSLATIONS = array(
 "Grant access" => "Предоставление доступа",
 "Please provide a valid Dropbox app key and secret." => "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
 "Error configuring Google Drive storage" => "Ошибка при настройке хранилища Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Поддержка Curl в PHP не включена или не установлена. Подключение ownCloud / WebDAV или GoogleDrive невозможно. Попросите вашего системного администратора установить его.",
+"Saved" => "Сохранено",
 "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" => "Импортировать корневые сертификаты"
 );
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
index ac41f596340..a9f39a3bbc9 100644
--- a/apps/files_external/l10n/si_LK.php
+++ b/apps/files_external/l10n/si_LK.php
@@ -9,8 +9,6 @@ $TRANSLATIONS = array(
 "Folder name" => "ෆොල්ඩරයේ නම",
 "Configuration" => "වින්‍යාසය",
 "Options" => "විකල්පයන්",
-"Applicable" => "අදාළ",
-"None set" => "කිසිවක් නැත",
 "All Users" => "සියළු පරිශීලකයන්",
 "Groups" => "කණ්ඩායම්",
 "Users" => "පරිශීලකයන්",
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index aa288982576..de32fb5ffb1 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -5,17 +5,13 @@ $TRANSLATIONS = array(
 "Grant access" => "Povoliť prístup",
 "Please provide a valid Dropbox app key and secret." => "Zadajte platný kľúč aplikácie a heslo Dropbox",
 "Error configuring Google Drive storage" => "Chyba pri konfigurácii úložiska Google drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>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.",
-"<b>Warning:</b> The 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>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.",
-"<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>Varovanie:</b> nie je nainštalovaná, alebo povolená, podpora Curl v PHP. Nie je možné pripojenie oddielov ownCloud, WebDAV, či GoogleDrive. Prosím požiadajte svojho administrátora systému, nech ju nainštaluje.",
+"Saved" => "Uložené",
 "External Storage" => "Externé úložisko",
 "Folder name" => "Názov priečinka",
 "External storage" => "Externé úložisko",
 "Configuration" => "Nastavenia",
 "Options" => "Možnosti",
-"Applicable" => "Aplikovateľné",
 "Add storage" => "Pridať úložisko",
-"None set" => "Žiadne nastavené",
 "All Users" => "Všetci používatelia",
 "Groups" => "Skupiny",
 "Users" => "Používatelia",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 05e626fcf83..bb34494a5d7 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -6,17 +6,14 @@ $TRANSLATIONS = array(
 "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.",
 "External Storage" => "Zunanja podatkovna shramba",
 "Folder name" => "Ime mape",
 "External storage" => "Zunanja shramba",
 "Configuration" => "Nastavitve",
 "Options" => "Možnosti",
-"Applicable" => "Se uporablja",
+"Available for" => "Na voljo za",
 "Add storage" => "Dodaj shrambo",
-"None set" => "Ni nastavljeno",
+"No user or group" => "Ni uporabnika ali skupine",
 "All Users" => "Vsi uporabniki",
 "Groups" => "Skupine",
 "Users" => "Uporabniki",
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 183df674b9d..ad5e6ad050c 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -5,22 +5,21 @@ $TRANSLATIONS = array(
 "Grant access" => "Bevilja åtkomst",
 "Please provide a valid Dropbox app key and secret." => "Ange en giltig Dropbox nyckel och hemlighet.",
 "Error configuring Google Drive storage" => "Fel vid konfigurering av Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>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.",
-"<b>Warning:</b> The 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>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.",
-"<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>Varning:<b> Curl-stöd i PHP är inte aktiverat eller installerat. Montering av ownCloud / WebDAV eller GoogleDrive är inte möjligt. Vänligen be din administratör att installera det.",
+"Saved" => "Sparad",
 "External Storage" => "Extern lagring",
 "Folder name" => "Mappnamn",
 "External storage" => "Extern lagring",
 "Configuration" => "Konfiguration",
 "Options" => "Alternativ",
-"Applicable" => "Tillämplig",
+"Available for" => "Tillgänglig för",
 "Add storage" => "Lägg till lagring",
-"None set" => "Ingen angiven",
+"No user or group" => "Ingen användare eller grupp",
 "All Users" => "Alla användare",
 "Groups" => "Grupper",
 "Users" => "Användare",
 "Delete" => "Radera",
 "Enable User External Storage" => "Aktivera extern lagring för användare",
+"Allow users to mount the following external storage" => "Tillåt användare att montera följande 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 94ddaf9c5e1..fe5d2a8bc87 100644
--- a/apps/files_external/l10n/ta_LK.php
+++ b/apps/files_external/l10n/ta_LK.php
@@ -9,8 +9,6 @@ $TRANSLATIONS = array(
 "Folder name" => "கோப்புறை பெயர்",
 "Configuration" => "தகவமைப்பு",
 "Options" => "தெரிவுகள்",
-"Applicable" => "பயன்படத்தக்க",
-"None set" => "தொகுப்பில்லா",
 "All Users" => "பயனாளர்கள் எல்லாம்",
 "Groups" => "குழுக்கள்",
 "Users" => "பயனாளர்",
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index a1a56a4d2e4..e3653eb41f7 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -5,14 +5,10 @@ $TRANSLATIONS = array(
 "Grant access" => "อนุญาตให้เข้าถึงได้",
 "Please provide a valid Dropbox app key and secret." => "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
 "Error configuring Google Drive storage" => "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>คำเตือน:</b> \"smbclient\" ยังไม่ได้ถูกติดตั้ง. การชี้ CIFS/SMB เพื่อแชร์ข้อมูลไม่สามารถกระทำได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>คำเตือน:</b> การสนับสนุนการใช้งาน FTP ในภาษา PHP ยังไม่ได้ถูกเปิดใช้งานหรือถูกติดตั้ง. การชี้ FTP เพื่อแชร์ข้อมูลไม่สามารถดำเนินการได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง",
 "External Storage" => "พื้นทีจัดเก็บข้อมูลจากภายนอก",
 "Folder name" => "ชื่อโฟลเดอร์",
 "Configuration" => "การกำหนดค่า",
 "Options" => "ตัวเลือก",
-"Applicable" => "สามารถใช้งานได้",
-"None set" => "ยังไม่มีการกำหนด",
 "All Users" => "ผู้ใช้งานทั้งหมด",
 "Groups" => "กลุ่ม",
 "Users" => "ผู้ใช้งาน",
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index a835d6f174a..3646a47605d 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -6,17 +6,19 @@ $TRANSLATIONS = array(
 "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.",
+"<b>Note:</b> " => "<b>Not:</b> ",
+" and " => "ve",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
 "External Storage" => "Harici Depolama",
-"Folder name" => "Dizin ismi",
+"Folder name" => "Klasör ismi",
 "External storage" => "Harici depolama",
 "Configuration" => "Yapılandırma",
 "Options" => "Seçenekler",
-"Applicable" => "Uygulanabilir",
+"Available for" => "Kullanabilenler",
 "Add storage" => "Depo ekle",
-"None set" => "Hiçbiri",
+"No user or group" => "Kullanıcı veya grup yok",
 "All Users" => "Tüm Kullanıcılar",
 "Groups" => "Gruplar",
 "Users" => "Kullanıcılar",
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index a7c028aa935..533eba07eb1 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "Дозволити доступ",
 "Please provide a valid Dropbox app key and secret." => "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
 "Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Попередження:</b> Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Попередження:</b> Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Попередження:</b> Підтримка CURL в PHP не увімкнута чи не встановлена. Під'єднанатися OwnCloud / WebDav або Google Drive неможливе. Попрохайте системного адміністратора встановити її.",
 "External Storage" => "Зовнішні сховища",
 "Folder name" => "Ім'я теки",
 "External storage" => "Зовнішнє сховище",
 "Configuration" => "Налаштування",
 "Options" => "Опції",
-"Applicable" => "Придатний",
 "Add storage" => "Додати сховище",
-"None set" => "Не встановлено",
 "All Users" => "Усі користувачі",
 "Groups" => "Групи",
 "Users" => "Користувачі",
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 5fd00dc2bf5..787fc82832e 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "Cấp quyền truy cập",
 "Please provide a valid Dropbox app key and secret." => "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
 "Error configuring Google Drive storage" => "Lỗi cấu hình lưu trữ Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>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ó.",
-"<b>Warning:</b> The 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>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ó.",
-"<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>Cảnh báo:</b> Tính năng Curl trong PHP chưa được kích hoạt hoặc cài đặt. Việc gắn kết ownCloud / WebDAV hay GoogleDrive không thực hiện được. Vui lòng liên hệ người quản trị để cài đặt nó.",
 "External Storage" => "Lưu trữ ngoài",
 "Folder name" => "Tên thư mục",
 "External storage" => "Lưu trữ ngoài",
 "Configuration" => "Cấu hình",
 "Options" => "Tùy chọn",
-"Applicable" => "Áp dụng",
 "Add storage" => "Thêm bộ nhớ",
-"None set" => "không",
 "All Users" => "Tất cả người dùng",
 "Groups" => "Nhóm",
 "Users" => "Người dùng",
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index bb85d0e4f49..40d5158bf5c 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "授权",
 "Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret",
 "Error configuring Google Drive storage" => "配置Google Drive存储时出错",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<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" => "用户",
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index 7c256cd2ab7..ac480e405fb 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -5,17 +5,12 @@ $TRANSLATIONS = array(
 "Grant access" => "允許存取",
 "Please provide a valid Dropbox app key and secret." => "請提供有效的 Dropbox app key 和 app secret 。",
 "Error configuring Google Drive storage" => "設定 Google Drive 儲存時發生錯誤",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<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 或 Google Drive 分享，請洽您的系統管理員將其安裝並啓用。",
 "External Storage" => "外部儲存",
 "Folder name" => "資料夾名稱",
 "External storage" => "外部儲存",
 "Configuration" => "設定",
 "Options" => "選項",
-"Applicable" => "可用的",
 "Add storage" => "增加儲存區",
-"None set" => "尚未設定",
 "All Users" => "所有使用者",
 "Groups" => "群組",
 "Users" => "使用者",
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 06ccd5d16fa..2093fb7e58c 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -548,4 +548,16 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			return false;
 		}
 	}
+
+	/**
+	 * check if curl is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('curl_init')) {
+			return true;
+		} else {
+			return array('curl');
+		}
+	}
+
 }
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 2c8828c4d51..613f0b2609c 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,10 +21,16 @@
 * 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';
@@ -31,6 +39,34 @@ class OC_Mount_Config {
 	// whether to skip backend test (for unit tests, as this static class is not mockable)
 	public static $skipTest = false;
 
+	private static $backends = array();
+
+	/**
+	 * @param string $class
+	 * @param array $definition
+	 * @return bool
+	 */
+	public static function registerBackend($class, $definition) {
+		if (!isset($definition['backend'])) {
+			return false;
+		}
+
+		OC_Mount_Config::$backends[$class] = $definition;
+		return true;
+	}
+
+	/**
+	 * Setup backends
+	 *
+	 * @return array of previously registered backends
+	 */
+	public static function setUp($backends = array()) {
+		$backup = self::$backends;
+		self::$backends = $backends;
+
+		return $backup;
+	}
+
 	/**
 	* 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
@@ -38,127 +74,125 @@ class OC_Mount_Config {
 	* 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 string
+	* @return array
 	*/
 	public static function getBackends() {
+		$sortFunc = function($a, $b) {
+			return strcasecmp($a['backend'], $b['backend']);
+		};
+
+		$backEnds = array();
+
+		foreach (OC_Mount_Config::$backends as $class => $backend) {
+			if (isset($backend['has_dependencies']) and $backend['has_dependencies'] === true) {
+				if (!method_exists($class, 'checkDependencies')) {
+					\OCP\Util::writeLog('files_external',
+						"Backend class $class has dependencies but doesn't provide method checkDependencies()",
+						\OCP\Util::DEBUG);
+					continue;
+				} elseif ($class::checkDependencies() !== true) {
+					continue;
+				}
+			}
+			$backEnds[$class] = $backend;
+		}
+
+		uasort($backEnds, $sortFunc);
+
+		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;
+					}
+				}
+			}
+		}
 
-		$backends['\OC\Files\Storage\Local']=array(
-				'backend' => 'Local',
-				'configuration' => array(
-					'datadir' => 'Location'));
-
-		$backends['\OC\Files\Storage\AmazonS3']=array(
-			'backend' => 'Amazon S3 and compliant',
-			'configuration' => array(
-				'key' => 'Access Key',
-				'secret' => '*Secret Key',
-				'bucket' => 'Bucket',
-				'hostname' => '&Hostname (optional)',
-				'port' => '&Port (optional)',
-				'region' => '&Region (optional)',
-				'use_ssl' => '!Enable SSL',
-				'use_path_style' => '!Enable Path Style'));
-
-		$backends['\OC\Files\Storage\Dropbox']=array(
-			'backend' => 'Dropbox',
-			'configuration' => array(
-				'configured' => '#configured',
-				'app_key' => 'App key',
-				'app_secret' => '*App secret',
-				'token' => '#token',
-				'token_secret' => '#token_secret'),
-				'custom' => 'dropbox');
-
-		if(OC_Mount_Config::checkphpftp()) $backends['\OC\Files\Storage\FTP']=array(
-			'backend' => 'FTP',
-			'configuration' => array(
-				'host' => 'Hostname',
-				'user' => 'Username',
-				'password' => '*Password',
-				'root' => '&Root',
-				'secure' => '!Secure ftps://'));
-
-		if(OC_Mount_Config::checkcurl()) $backends['\OC\Files\Storage\Google']=array(
-			'backend' => 'Google Drive',
-			'configuration' => array(
-				'configured' => '#configured',
-				'client_id' => 'Client ID',
-				'client_secret' => '*Client secret',
-				'token' => '#token'),
-				'custom' => 'google');
-
-		if(OC_Mount_Config::checkcurl()) {
-			$backends['\OC\Files\Storage\Swift'] = array(
-				'backend' => 'OpenStack Object Storage',
-				'configuration' => array(
-					'user' => 'Username (required)',
-					'bucket' => 'Bucket (required)',
-					'region' => '&Region (optional for OpenStack Object Storage)',
-					'key' => '*API Key (required for Rackspace Cloud Files)',
-					'tenant' => '&Tenantname (required for OpenStack Object Storage)',
-					'password' => '*Password (required for OpenStack Object Storage)',
-					'service_name' => '&Service Name (required for OpenStack Object Storage)',
-					'url' => '&URL of identity endpoint (required for OpenStack Object Storage)',
-					'timeout' => '&Timeout of HTTP requests in seconds (optional)',
-				)
-			);
-                }
-
-		if (!OC_Util::runningOnWindows()) {
-			if (OC_Mount_Config::checksmbclient()) {
-				$backends['\OC\Files\Storage\SMB'] = array(
-					'backend' => 'SMB / CIFS',
-					'configuration' => array(
-						'host' => 'URL',
-						'user' => 'Username',
-						'password' => '*Password',
-						'share' => 'Share',
-						'root' => '&Root'));
+		// 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;
 			}
 		}
 
-		if(OC_Mount_Config::checkcurl()){
-		   	$backends['\OC\Files\Storage\DAV']=array(
-				'backend' => 'WebDAV',
-				'configuration' => array(
-					'host' => 'URL',
-					'user' => 'Username',
-					'password' => '*Password',
-					'root' => '&Root',
-					'secure' => '!Secure https://'));
-		   	$backends['\OC\Files\Storage\OwnCloud']=array(
-				'backend' => 'ownCloud',
-				'configuration' => array(
-					'host' => 'URL',
-					'user' => 'Username',
-					'password' => '*Password',
-					'root' => '&Remote subfolder',
-					'secure' => '!Secure https://'));
-		}
-
-		$backends['\OC\Files\Storage\SFTP']=array(
-			'backend' => 'SFTP',
-			'configuration' => array(
-				'host' => 'URL',
-				'user' => 'Username',
-				'password' => '*Password',
-				'root' => '&Root'));
-
-		$backends['\OC\Files\Storage\iRODS']=array(
-			'backend' => 'iRODS',
-			'configuration' => array(
-				'host' => 'Host',
-				'port' => 'Port',
-				'use_logon_credentials' => '!Use ownCloud login',
-				'user' => 'Username',
-				'password' => '*Password',
-				'auth_mode' => 'Authentication Mode',
-				'zone' => 'Zone'));
-
-		return($backends);
+		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.
@@ -172,19 +206,19 @@ class OC_Mount_Config {
 	*/
 	public static function getPersonalBackends() {
 
-		$backends = self::getBackends();
+		$backEnds = self::getBackends();
 
 		// Remove local storage and other disabled storages
-		unset($backends['\OC\Files\Storage\Local']);
+		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]);
+		$allowedBackEnds = explode(',', OCP\Config::getAppValue('files_external', 'user_mounting_backends', ''));
+		foreach ($backEnds as $backend => $null) {
+			if (!in_array($backend, $allowedBackEnds)) {
+				unset($backEnds[$backend]);
 			}
 		}
 
-		return $backends;
+		return $backEnds;
 	}
 
 	/**
@@ -203,20 +237,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;
 					}
 				}
 			}
@@ -228,25 +268,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);
 	}
 
 	/**
@@ -256,7 +301,7 @@ class OC_Mount_Config {
 	*/
 	public static function getPersonalMountPoints() {
 		$mountPoints = self::readData(true);
-		$backends = self::getBackends();
+		$backEnds = self::getBackends();
 		$uid = OCP\User::getUser();
 		$personal = array();
 		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {
@@ -265,29 +310,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'],
-					'backend' => $backends[$mount['class']]['backend'],
-					'configuration' => $mount['options'],
-					'status' => self::getBackendStatus($mount['class'], $mount['options'])
+					// Remove '/uid/files/' from mount point
+					'mountpoint' => substr($mountPoint, strlen($uid) + 8),
+					'backend' => $backEnds[$mount['class']]['backend'],
+					'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;
@@ -334,7 +387,13 @@ class OC_Mount_Config {
 		} 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])) {
@@ -348,7 +407,7 @@ class OC_Mount_Config {
 			$mountPoints[$mountType] = $mount;
 		}
 		self::writeData($isPersonal, $mountPoints);
-		return self::getBackendStatus($class, $classOptions);
+		return self::getBackendStatus($class, $classOptions, $isPersonal);
 	}
 
 	/**
@@ -425,7 +484,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);
 	}
@@ -478,53 +542,173 @@ class OC_Mount_Config {
 	}
 
 	/**
-	 * check if smbclient is installed
+	 * check dependencies
 	 */
-	public static function checksmbclient() {
-		if(function_exists('shell_exec')) {
-			$output=shell_exec('command -v smbclient 2> /dev/null');
-			return !empty($output);
-		}else{
-			return false;
+	public static function checkDependencies() {
+		$dependencies = array();
+		foreach (OC_Mount_Config::$backends as $class => $backend) {
+			if (isset($backend['has_dependencies']) and $backend['has_dependencies'] === true) {
+				$result = $class::checkDependencies();
+				if ($result !== true) {
+					if (!is_array($result)) {
+						$result = array($result);
+					}
+					foreach ($result as $key => $value) {
+						if (is_numeric($key)) {
+							OC_Mount_Config::addDependency($dependencies, $value, $backend['backend']);
+						} else {
+							OC_Mount_Config::addDependency($dependencies, $key, $backend['backend'], $value);
+						}
+					}
+				}
+			}
+		}
+
+		if (count($dependencies) > 0) {
+			return OC_Mount_Config::generateDependencyMessage($dependencies);
+		}
+		return '';
+	}
+
+	private static function addDependency(&$dependencies, $module, $backend, $message=null) {
+		if (!isset($dependencies[$module])) {
+			$dependencies[$module] = array();
+		}
+
+		if ($message === null) {
+			$dependencies[$module][] = $backend;
+		} else {
+			$dependencies[$module][] = array('backend' => $backend, 'message' => $message);
 		}
 	}
 
+	private static function generateDependencyMessage($dependencies) {
+		$l = new \OC_L10N('files_external');
+		$dependencyMessage = '';
+		foreach ($dependencies as $module => $backends) {
+			$dependencyGroup = array();
+			foreach ($backends as $backend) {
+				if (is_array($backend)) {
+					$dependencyMessage .= '<br />' . $l->t('<b>Note:</b> ') . $backend['message'];
+				} else {
+					$dependencyGroup[] = $backend;
+				}
+			}
+
+			if (count($dependencyGroup) > 0) {
+				$backends = '';
+				for ($i = 0; $i < count($dependencyGroup); $i++) {
+					if ($i > 0 && $i === count($dependencyGroup) - 1) {
+						$backends .= $l->t(' and ');
+					} elseif ($i > 0) {
+						$backends .= ', ';
+					}
+					$backends .= '<i>' . $dependencyGroup[$i] . '</i>';
+				}
+				$dependencyMessage .= '<br />' . OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends);
+			}
+		}
+		return $dependencyMessage;
+	}
+
 	/**
-	 * check if php-ftp is installed
+	 * Returns a dependency missing message
+	 * @param $l OC_L10N
+	 * @param $module string
+	 * @param $backend string
+	 * @return string
 	 */
-	public static function checkphpftp() {
-		if(function_exists('ftp_login')) {
-			return true;
-		}else{
-			return false;
+	private static function getSingleDependencyMessage($l, $module, $backend) {
+		switch (strtolower($module)) {
+			case 'curl':
+				return $l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
+			case 'ftp':
+				return $l->t('<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
+			default:
+				return $l->t('<b>Note:</b> "%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend));
 		}
 	}
 
 	/**
-	 * check if curl is installed
+	 * Encrypt passwords in the given config options
+	 * @param array $options mount options
+	 * @return array updated options
 	 */
-	public static function checkcurl() {
-		return function_exists('curl_init');
+	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;
 	}
 
 	/**
-	 * check dependencies
+	 * Decrypt passwords in the given config options
+	 * @param array $options mount options
+	 * @return array updated options
 	 */
-	public static function checkDependencies() {
-		$l= new OC_L10N('files_external');
-		$txt='';
-		if (!OC_Util::runningOnWindows()) {
-			if(!OC_Mount_Config::checksmbclient()) {
-				$txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
-			}
-		}
-		if(!OC_Mount_Config::checkphpftp()) {
-			$txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />';
+	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']);
 		}
-		if(!OC_Mount_Config::checkcurl()) {
-			$txt.=$l->t('<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.').'<br />';
+		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;
+	}
 
-		return $txt;
+	/**
+	 * 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/dropbox.php b/apps/files_external/lib/dropbox.php
index 0214e18020c..38de3360f2b 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -311,4 +311,15 @@ class Dropbox extends \OC\Files\Storage\Common {
 		return true;
 	}
 
+	/**
+	 * check if curl is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('curl_init')) {
+			return true;
+		} else {
+			return array('curl');
+		}
+	}
+
 }
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 00bf7a189ce..b3f8b1444ae 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -119,4 +119,16 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 			unlink($tmpFile);
 		}
 	}
+
+	/**
+	 * check if php-ftp is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('ftp_login')) {
+			return(true);
+		} else {
+			return array('ftp');
+		}
+	}
+
 }
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 35457f68528..56c0d451651 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -586,4 +586,15 @@ class Google extends \OC\Files\Storage\Common {
 		return false;
 	}
 
+	/**
+	 * check if curl is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('curl_init')) {
+			return true;
+		} else {
+			return array('curl');
+		}
+	}
+
 }
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index c5fba92ee68..b1d355323d9 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');
 		}
 	}
 
@@ -134,4 +134,18 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 		}
 		return $lastCtime;
 	}
+
+	/**
+	 * check if smbclient is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('shell_exec')) {
+			$output=shell_exec('command -v smbclient 2> /dev/null');
+			if (!empty($output)) {
+				return true;
+			}
+		}
+		return array('smbclient');
+	}
+
 }
diff --git a/apps/files_external/lib/smb_oc.php b/apps/files_external/lib/smb_oc.php
new file mode 100644
index 00000000000..0c79c06c5df
--- /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 7a56fcfc8b7..a202d3843cb 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -65,6 +65,18 @@ class Swift extends \OC\Files\Storage\Common {
 		return $path;
 	}
 
+	const SUBCONTAINER_FILE='.subcontainers';
+
+	/**
+	 * translate directory path to container name
+	 * @param string $path
+	 * @return string
+	 */
+	private function getContainerName($path) {
+		$path=trim(trim($this->root, '/') . "/".$path, '/.');
+		return str_replace('/', '\\', $path);
+	}
+
 	/**
 	 * @param string $path
 	 */
@@ -251,6 +263,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 +386,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)) {
@@ -486,4 +502,16 @@ class Swift extends \OC\Files\Storage\Common {
 		), $tmpFile);
 		unlink($tmpFile);
 	}
+
+	/**
+	 * check if curl is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('curl_init')) {
+			return true;
+		} else {
+			return array('curl');
+		}
+	}
+
 }
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 279ae716935..dc98dcfb808 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -267,7 +267,7 @@ class DAV extends \OC\Files\Storage\Common {
 
 		$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_URL, $this->createBaseUri() . $this->encodePath($target));
 		curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
 		curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
 		curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));
@@ -385,5 +385,16 @@ class DAV extends \OC\Files\Storage\Common {
 			return false;
 		}
 	}
+
+	/**
+	 * check if curl is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('curl_init')) {
+			return true;
+		} else {
+			return array('curl');
+		}
+	}
 }
 
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index de44d3c8644..0d04e35e7fe 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,149 +1,152 @@
-<form id="files_external">
-	<fieldset class="personalblock">
+<form id="files_external" class="section">
 	<h2><?php p($l->t('External Storage')); ?></h2>
-		<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) print_unescaped(''.$_['dependencies'].''); ?>
-		<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
-			<thead>
-				<tr>
-					<th></th>
-					<th><?php p($l->t('Folder name')); ?></th>
-					<th><?php p($l->t('External storage')); ?></th>
-					<th><?php p($l->t('Configuration')); ?></th>
-					<!--<th><?php p($l->t('Options')); ?></th> -->
-					<?php if ($_['isAdminPage']) print_unescaped('<th>'.$l->t('Applicable').'</th>'); ?>
-					<th>&nbsp;</th>
-				</tr>
-			</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"'); ?>>
-					<td class="status">
-					<?php if (isset($mount['status'])): ?>
-						<span class="<?php p(($mount['status']) ? 'success' : 'error'); ?>"></span>
-					<?php endif; ?>
+	<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) print_unescaped(''.$_['dependencies'].''); ?>
+	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
+		<thead>
+			<tr>
+				<th></th>
+				<th><?php p($l->t('Folder name')); ?></th>
+				<th><?php p($l->t('External storage')); ?></th>
+				<th><?php p($l->t('Configuration')); ?></th>
+				<!--<th><?php p($l->t('Options')); ?></th> -->
+				<?php if ($_['isAdminPage']) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
+				<th>&nbsp;</th>
+			</tr>
+		</thead>
+		<tbody width="100%">
+		<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
+		<?php foreach ($_['mounts'] as $mount): ?>
+			<tr <?php print_unescaped(isset($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(isset($mount['mountpoint']) ? $mount['mountpoint'] : ''); ?>"
+											  placeholder="<?php p($l->t('Folder name')); ?>" /></td>
+				<?php if (!isset($mount['mountpoint'])): ?>
+					<td class="backend">
+						<select id="selectBackend" data-configurations='<?php print_unescaped(json_encode($_['backends'])); ?>'>
+							<option value="" disabled selected
+									style="display:none;"><?php p($l->t('Add storage')); ?></option>
+							<?php foreach ($_['backends'] as $class => $backend): ?>
+								<option value="<?php p($class); ?>"><?php p($backend['backend']); ?></option>
+							<?php endforeach; ?>
+						</select>
 					</td>
-					<td class="mountPoint"><input type="text" name="mountPoint"
-												  value="<?php p($mountPoint); ?>"
-												  placeholder="<?php p($l->t('Folder name')); ?>" /></td>
-					<?php if ($mountPoint == ''): ?>
-						<td class="backend">
-							<select id="selectBackend" data-configurations='<?php print_unescaped(json_encode($_['backends'])); ?>'>
-								<option value="" disabled selected
-										style="display:none;"><?php p($l->t('Add storage')); ?></option>
-								<?php foreach ($_['backends'] as $class => $backend): ?>
-									<option value="<?php p($class); ?>"><?php p($backend['backend']); ?></option>
-								<?php endforeach; ?>
-							</select>
-						</td>
-					<?php else: ?>
-						<td class="backend"
-							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($_['backends'][$mount['class']]['configuration'][$parameter])): ?>
-									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
-									<?php if (strpos($placeholder, '*') !== false): ?>
-										<input type="password"
-											   data-parameter="<?php p($parameter); ?>"
-											   value="<?php p($value); ?>"
-											   placeholder="<?php p(substr($placeholder, 1)); ?>" />
-									<?php elseif (strpos($placeholder, '!') !== false): ?>
-										<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): ?>
-										<input type="hidden"
-											   data-parameter="<?php p($parameter); ?>"
-											   value="<?php p($value); ?>" />
-									<?php else: ?>
-										<input type="text"
-											   data-parameter="<?php p($parameter); ?>"
-											   value="<?php p($value); ?>"
-											   placeholder="<?php p($placeholder); ?>" />
-									<?php endif; ?>
+				<?php else: ?>
+					<td class="backend"
+						data-class="<?php p($mount['class']); ?>"><?php p($mount['backend']); ?></td>
+				<?php endif; ?>
+				<td class ="configuration" width="100%">
+					<?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];
+									$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, '!') === 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, '#') === 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); ?>" />
 								<?php endif; ?>
-							<?php endforeach; ?>
-							<?php if (isset($_['backends'][$mount['class']]['custom']) && !in_array('files_external/js/'.$_['backends'][$mount['class']]['custom'], \OC_Util::$scripts)): ?>
-								<?php OCP\Util::addScript('files_external', $_['backends'][$mount['class']]['custom']); ?>
 							<?php endif; ?>
+						<?php endforeach; ?>
+						<?php if (isset($_['backends'][$mount['class']]['custom']) && !in_array('files_external/js/'.$_['backends'][$mount['class']]['custom'], \OC_Util::$scripts)): ?>
+							<?php OCP\Util::addScript('files_external', $_['backends'][$mount['class']]['custom']); ?>
 						<?php endif; ?>
-					</td>
-					<?php if ($_['isAdminPage']): ?>
-					<td class="applicable"
-						align="right"
-						data-applicable-groups='<?php if (isset($mount['applicable']['groups']))
-														print_unescaped(json_encode($mount['applicable']['groups'])); ?>'
-						data-applicable-users='<?php if (isset($mount['applicable']['users']))
-														print_unescaped(json_encode($mount['applicable']['users'])); ?>'>
-							<select class="chzn-select"
-									multiple style="width:20em;"
-									data-placeholder="<?php p($l->t('None set')); ?>">
-								<option value="all" <?php if (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users'])) print_unescaped('selected="selected"');?> ><?php p($l->t('All Users')); ?></option>
-								<optgroup label="<?php p($l->t('Groups')); ?>">
-								<?php foreach ($_['groups'] as $group): ?>
-									<option value="<?php p($group); ?>(group)"
-									<?php if (isset($mount['applicable']['groups']) && in_array($group, $mount['applicable']['groups'])): ?>
-											selected="selected"
-									<?php endif; ?>><?php p($group); ?></option>
-								<?php endforeach; ?>
-								</optgroup>
-								<optgroup label="<?php p($l->t('Users')); ?>">
-								<?php foreach ($_['users'] as $user): ?>
-									<option value="<?php p($user); ?>"
-									<?php if (isset($mount['applicable']['users']) && in_array($user, $mount['applicable']['users'])): ?>
-											selected="selected"
-									<?php endif; ?>><?php p($_['userDisplayNames'][$user]); ?></option>
-								<?php endforeach; ?>
-								</optgroup>
-							</select>
-						</td>
 					<?php endif; ?>
-					<td <?php if ($mountPoint != ''): ?>class="remove"
-						<?php else: ?>style="visibility:hidden;"
-						<?php endif ?>><img alt="<?php p($l->t('Delete')); ?>"
-											title="<?php p($l->t('Delete')); ?>"
-											class="svg action"
-											src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>" /></td>
-				</tr>
-			<?php endforeach; ?>
-			</tbody>
-		</table>
-		<br />
+				</td>
+				<?php if ($_['isAdminPage']): ?>
+				<td class="applicable"
+					align="right"
+					data-applicable-groups='<?php if (isset($mount['applicable']['groups']))
+													print_unescaped(json_encode($mount['applicable']['groups'])); ?>'
+					data-applicable-users='<?php if (isset($mount['applicable']['users']))
+													print_unescaped(json_encode($mount['applicable']['users'])); ?>'>
+						<select class="chzn-select"
+							multiple style="width:20em;"
+							data-placeholder="<?php p($l->t('No user or group')); ?>">
+							<option value="all"
+								<?php if (empty($mount['class']) || (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users']))) print_unescaped('selected="selected"');?> >
+								<?php p($l->t('All Users')); ?>
+							</option>
+							<optgroup label="<?php p($l->t('Groups')); ?>">
+							<?php foreach ($_['groups'] as $group): ?>
+								<option value="<?php p($group); ?>(group)"
+								<?php if (isset($mount['applicable']['groups']) && in_array($group, $mount['applicable']['groups'])): ?>
+										selected="selected"
+								<?php endif; ?>><?php p($group); ?></option>
+							<?php endforeach; ?>
+							</optgroup>
+							<optgroup label="<?php p($l->t('Users')); ?>">
+							<?php foreach ($_['users'] as $user): ?>
+								<option value="<?php p($user); ?>"
+								<?php if (isset($mount['applicable']['users']) && in_array($user, $mount['applicable']['users'])): ?>
+										selected="selected"
+								<?php endif; ?>><?php p($_['userDisplayNames'][$user]); ?></option>
+							<?php endforeach; ?>
+							</optgroup>
+						</select>
+					</td>
+				<?php endif; ?>
+				<td <?php if (isset($mount['mountpoint'])): ?>class="remove"
+					<?php else: ?>style="visibility:hidden;"
+					<?php endif ?>><img alt="<?php p($l->t('Delete')); ?>"
+										title="<?php p($l->t('Delete')); ?>"
+										class="svg action"
+										src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>" /></td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+	<br />
 
-		<?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> <span id="userMountingMsg" class="msg"></span>
+	<?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> <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>
+		<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; ?>
 </form>
 
 <?php if ( ! $_['isAdminPage']):  ?>
-<form id="files_external"
+<form id="files_external" class="section"
 	  method="post"
 	  enctype="multipart/form-data"
 	  action="<?php p(OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php')); ?>">
-<fieldset class="personalblock">
 		<h2><?php p($l->t('SSL root certificates'));?></h2>
 		<table id="sslCertificate" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
 			<tbody width="100%">
@@ -163,6 +166,5 @@
 		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>">
 		<input type="file" id="rootcert_import" name="rootcert_import">
 		<input type="submit" name="cert_import" value="<?php p($l->t('Import Root Certificate')); ?>" />
-</fieldset>
 </form>
 <?php endif; ?>
diff --git a/apps/files_external/tests/dynamicmountconfig.php b/apps/files_external/tests/dynamicmountconfig.php
new file mode 100644
index 00000000000..81a31e14c60
--- /dev/null
+++ b/apps/files_external/tests/dynamicmountconfig.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * Copyright (c) 2014 Thomas Müller <deepdiver@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/>.
+ *
+ */
+
+require_once __DIR__ . '/../../../lib/base.php';
+
+require __DIR__ . '/../lib/config.php';
+
+/**
+ * Class Test_Mount_Config_Dummy_Backend
+ */
+class Test_Mount_Config_Dummy_Backend {
+	public static $checkDependencies = true;
+
+	public static function checkDependencies() {
+		return self::$checkDependencies;
+	}
+}
+
+/**
+ * Class Test_Dynamic_Mount_Config
+ */
+class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase {
+
+	private $backup;
+
+	public function testRegistration() {
+
+		// second registration shall return false
+		$result = OC_Mount_Config::registerBackend('Test_Mount_Config_Dummy_Backend', array(
+			'backend' => 'Test Dummy',
+			'configuration' => array(),
+			'has_dependencies' => true));
+
+		$this->assertTrue($result);
+	}
+
+	public function testDependencyGetBackend() {
+
+		// is the backend listed?
+		Test_Mount_Config_Dummy_Backend::$checkDependencies = true;
+		$backEnds = OC_Mount_Config::getBackends();
+		$this->assertArrayHasKey('Test_Mount_Config_Dummy_Backend', $backEnds);
+
+		// backend shall not be listed
+		Test_Mount_Config_Dummy_Backend::$checkDependencies = false;
+
+		$backEnds = OC_Mount_Config::getBackends();
+		$this->assertArrayNotHasKey('Test_Mount_Config_Dummy_Backend', $backEnds);
+
+	}
+
+	public function testCheckDependencies() {
+
+		Test_Mount_Config_Dummy_Backend::$checkDependencies = true;
+		$message = OC_Mount_Config::checkDependencies();
+		$this->assertEmpty($message);
+
+		// backend shall not be listed
+		Test_Mount_Config_Dummy_Backend::$checkDependencies = array('dummy');
+
+		$message = OC_Mount_Config::checkDependencies();
+		$this->assertEquals('<br /><b>Note:</b> "dummy" is not installed. Mounting of <i>Test Dummy</i> is not possible. Please ask your system administrator to install it.',
+			$message);
+
+	}
+
+	protected function setUp() {
+
+		$this->backup = OC_Mount_Config::setUp();
+
+		// register dummy backend
+		$result = OC_Mount_Config::registerBackend('Test_Mount_Config_Dummy_Backend', array(
+			'backend' => 'Test Dummy',
+			'configuration' => array(),
+			'has_dependencies' => true));
+
+		$this->assertTrue($result);
+	}
+
+	protected function tearDown()
+	{
+		OC_Mount_Config::setUp($this->backup);
+	}
+}
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index a22c7424c69..c89874c94d5 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -40,9 +40,22 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	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::setUserId('test');
-		$this->userHome = \OC_User::getHome('test');
+		\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(
@@ -67,9 +80,12 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	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');
-		@unlink($this->userHome . '/mount.json');
-		rmdir($this->userHome);
 
 		OCP\Config::setAppValue(
 			'files_external',
@@ -95,6 +111,14 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * 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
 	 */
 	public function testAddMountPointValidation() {
@@ -113,7 +137,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	 * Test adding a global mount point
 	 */
 	public function testAddGlobalMountPoint() {
-		$mountType = OC_Mount_Config::MOUNT_TYPE_GLOBAL;
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
 		$applicable = 'all';
 		$isPersonal = false;
 
@@ -135,7 +159,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testAddMountPointSingleUser() {
 		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
-		$applicable = 'test';
+		$applicable = self::TEST_USER1;
 		$isPersonal = true;
 
 		$this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
@@ -144,10 +168,10 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(1, count($config));
 		$this->assertTrue(isset($config[$mountType]));
 		$this->assertTrue(isset($config[$mountType][$applicable]));
-		$this->assertTrue(isset($config[$mountType][$applicable]['/test/files/ext']));
+		$this->assertTrue(isset($config[$mountType][$applicable]['/' . self::TEST_USER1 . '/files/ext']));
 		$this->assertEquals(
 			'\OC\Files\Storage\SFTP',
-			$config[$mountType][$applicable]['/test/files/ext']['class']
+			$config[$mountType][$applicable]['/' . self::TEST_USER1 . '/files/ext']['class']
 		);
 	}
 
@@ -156,7 +180,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testAddDisallowedBackendMountPointSingleUser() {
 		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
-		$applicable = 'test';
+		$applicable = self::TEST_USER1;
 		$isPersonal = true;
 
 		// local
@@ -181,9 +205,439 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	public function testAddMountPointUnexistClass() {
 		$storageClass = 'Unexist_Storage';
 		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
-		$applicable = 'test';
+		$applicable = self::TEST_USER1;
 		$isPersonal = false;
 		$this->assertFalse(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/ajax/list.php b/apps/files_sharing/ajax/list.php
new file mode 100644
index 00000000000..4b645496253
--- /dev/null
+++ b/apps/files_sharing/ajax/list.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * 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/>.
+ *
+ */
+
+// only need filesystem apps
+$RUNTIME_APPTYPES=array('filesystem');
+
+// Init owncloud
+
+if(!\OC_App::isEnabled('files_sharing')){
+	exit;
+}
+
+if(!isset($_GET['t'])){
+	\OC_Response::setStatus(400); //400 Bad Request
+	\OC_Log::write('core-preview', 'No token parameter was passed', \OC_Log::DEBUG);
+	exit;
+}
+
+$token = $_GET['t'];
+
+$password = null;
+if (isset($_POST['password'])) {
+	$password = $_POST['password'];
+}
+
+$relativePath = null;
+if (isset($_GET['dir'])) {
+	$relativePath = $_GET['dir'];
+}
+
+$data = \OCA\Files_Sharing\Helper::setupFromToken($token, $relativePath, $password);
+
+$linkItem = $data['linkItem'];
+// Load the files
+$dir = $data['realPath'];
+
+$dir = \OC\Files\Filesystem::normalizePath($dir);
+if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
+	\OC_Response::setStatus(404);
+	\OCP\JSON::error(array('success' => false));
+	exit();
+}
+
+$data = array();
+$baseUrl = OCP\Util::linkTo('files_sharing', 'index.php') . '?t=' . urlencode($token) . '&dir=';
+
+// make filelist
+$files = \OCA\Files\Helper::getFiles($dir);
+
+$formattedFiles = array();
+foreach ($files as $file) {
+	$entry = \OCA\Files\Helper::formatFileInfo($file);
+	unset($entry['directory']); // for now
+	$entry['permissions'] = \OCP\PERMISSION_READ;
+	$formattedFiles[] = $entry;
+}
+
+$data['directory'] = $relativePath;
+$data['files'] = $formattedFiles;
+$data['dirToken'] = $linkItem['token'];
+
+$permissions = $linkItem['permissions'];
+
+// if globally disabled
+if (OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
+	// only allow reading
+	$permissions = \OCP\PERMISSION_READ;
+}
+
+$data['permissions'] = $permissions;
+
+OCP\JSON::success(array('data' => $data));
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index 4b716e764f4..ab32108ea25 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -71,19 +71,6 @@ if (version_compare($installedVersion, '0.3', '<')) {
 }
 
 // clean up oc_share table from files which are no longer exists
-if (version_compare($installedVersion, '0.3.5', '<')) {
-
-	// get all shares where the original file no longer exists
-	$findShares = \OC_DB::prepare('SELECT `file_source` FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*filecache`.`fileid` IS NULL AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\')');
-	$sharesFound = $findShares->execute(array())->fetchAll();
-
-	// delete those shares from the oc_share table
-	if (is_array($sharesFound) && !empty($sharesFound)) {
-		$delArray = array();
-		foreach ($sharesFound as $share) {
-			$delArray[] = $share['file_source'];
-		}
-		$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `file_source` IN (?)');
-		$result = $removeShares->execute(array(implode(',', $delArray)));
-	}
+if (version_compare($installedVersion, '0.3.5.6', '<')) {
+	\OC\Files\Cache\Shared_Updater::fixBrokenSharesOnAppUpdate();
 }
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index 09e9157034c..8f91d33378e 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.3.5
\ No newline at end of file
+0.3.5.6
diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css
index 7d2116d190d..333c4c77fc9 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/css/public.css b/apps/files_sharing/css/public.css
index 5246a4b2fec..f0b9b04491f 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -35,6 +35,11 @@ body {
 	background: #fff;
 	text-align: center;
 	margin: 45px auto 0;
+	min-height: 150px;
+}
+
+#preview .notCreatable {
+	display: none;
 }
 
 #noPreview {
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 06c168969de..9ce8985f1fd 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -8,16 +8,7 @@
  *
  */
 
-/* global OC, FileList, FileActions */
-
-// Override download path to files_sharing/public.php
-function fileDownloadPath(dir, file) {
-	var url = $('#downloadURL').val();
-	if (url.indexOf('&path=') != -1) {
-		url += '/'+file;
-	}
-	return url;
-}
+/* global OC, FileActions, FileList, Files */
 
 $(document).ready(function() {
 
@@ -31,31 +22,43 @@ $(document).ready(function() {
 				action($('#filename').val());
 			}
 		}
-		FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function(filename) {
-			var tr = FileList.findFileEl(filename);
-			if (tr.length > 0) {
-				window.location = $(tr).find('a.name').attr('href');
-			}
-		});
+	}
 
-		// override since the format is different
-		FileList.getDownloadUrl = function(filename, dir) {
-			if ($.isArray(filename)) {
-				filename = JSON.stringify(filename);
-			}
-			var path = dir || FileList.getCurrentDirectory();
-			var params = {
-				service: 'files',
-				t: $('#sharingToken').val(),
-				path: path,
-				download: null
-			};
-			if (filename) {
-				params.files = filename;
-			}
-			return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+	// override since the format is different
+	Files.getDownloadUrl = function(filename, dir) {
+		if ($.isArray(filename)) {
+			filename = JSON.stringify(filename);
+		}
+		var path = dir || FileList.getCurrentDirectory();
+		var params = {
+			service: 'files',
+			t: $('#sharingToken').val(),
+			path: path,
+			files: filename,
+			download: null
 		};
-	}
+		return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+	};
+
+	Files.getAjaxUrl = function(action, params) {
+		params = params || {};
+		params.t = $('#sharingToken').val();
+		return OC.filePath('files_sharing', 'ajax', action + '.php') + '?' + OC.buildQueryString(params);
+	};
+
+	FileList.linkTo = function(dir) {
+		var params = {
+			service: 'files',
+			t: $('#sharingToken').val(),
+			dir: dir
+		};
+		return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+	};
+
+	Files.generatePreviewUrl = function(urlSpec) {
+		urlSpec.t = $('#dirToken').val();
+		return OC.generateUrl('/apps/files_sharing/ajax/publicpreview.php?') + $.param(urlSpec);
+	};
 
 	var file_upload_start = $('#file_upload_start');
 	file_upload_start.on('fileuploadadd', function(e, data) {
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 9f0ed12f935..3c7c9239a6c 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,15 +1,35 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global OC, t, FileList, FileActions */
 $(document).ready(function() {
 
 	var disableSharing = $('#disableSharing').data('status'),
 		sharesLoaded = false;
 
 	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined'  && !disableSharing) {
+		var oldCreateRow = FileList._createRow;
+		FileList._createRow = function(fileData) {
+			var tr = oldCreateRow.apply(this, arguments);
+			if (fileData.shareOwner) {
+				tr.attr('data-share-owner', fileData.shareOwner);
+			}
+			return tr;
+		};
+
 		$('#fileList').on('fileActionsReady',function(){
 
-			var allShared = $('#fileList').find('[data-share-owner]').find('[data-Action="Share"]');
+			var allShared = $('#fileList').find('[data-share-owner] [data-Action="Share"]');
 			allShared.addClass('permanent');
 			allShared.find('span').text(function(){
-				$owner = $(this).closest('tr').attr('data-share-owner');
+				var $owner = $(this).closest('tr').attr('data-share-owner');
 				return ' ' + t('files_sharing', 'Shared by {owner}', {owner: $owner});
 			});
 
@@ -25,11 +45,6 @@ $(document).ready(function() {
 		});
 
 		FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(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') {
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index e5f919aac3f..f796f7ec59d 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -1,7 +1,17 @@
 <?php
 $TRANSLATIONS = array(
-"Shared by {owner}" => "مشاركة بواسطة المالك  {owner}",
+"Shared by {owner}" => "مشاركة من طرف {owner}",
+"This share is password-protected" => "هذه المشاركة محمية بكلمة مرور",
+"The password is wrong. Try again." => "كلمة المرور خاطئة. حاول مرة أخرى",
 "Password" => "كلمة المرور",
-"shared by %s" => "مشاركة من قبل %s"
+"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/ast.php b/apps/files_sharing/l10n/ast.php
new file mode 100644
index 00000000000..02a2f6fb628
--- /dev/null
+++ b/apps/files_sharing/l10n/ast.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"Shared by {owner}" => "Compartíu por {owner}",
+"Password" => "Contraseña"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 5d50ff41316..e7a8b16f000 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -10,7 +10,7 @@ $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.",
-"shared by %s" => "sdíleno %s",
+"shared by %s" => "sdílí %s",
 "Download %s" => "Stáhnout %s",
 "Direct link" => "Přímý odkaz"
 );
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index 6aae750cb78..6c6a39c2954 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "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. ",
 "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/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index af5891fcc7f..7150f05da22 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "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.",
 "shared by %s" => "jagas %s",
+"Download %s" => "Laadi alla %s",
 "Direct link" => "Otsene link"
 );
 $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 4e9856da4a7..6856c0591f4 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "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.",
 "shared by %s" => "Zdieľa %s",
+"Download %s" => "Stiahnuť %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/sv.php b/apps/files_sharing/l10n/sv.php
index 2d037f9186e..94b7edf6977 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -10,6 +10,8 @@ $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.",
+"shared by %s" => "delad av %s",
+"Download %s" => "Ladda ner %s",
 "Direct link" => "Direkt länk"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 10f2182655f..eeb62c3cce2 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -20,6 +20,7 @@
  */
 
 namespace OC\Files\Cache;
+
 use OCP\Share_Backend_Collection;
 
 /**
@@ -50,7 +51,7 @@ class Shared_Cache extends Cache {
 			\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
 			$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
 			if (is_array($mount)) {
-				$fullPath = $mount[key($mount)]->getMountPoint().$source['path'];
+				$fullPath = $mount[key($mount)]->getMountPoint() . $source['path'];
 				list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
 				if ($storage) {
 					$this->files[$target] = $internalPath;
@@ -75,7 +76,7 @@ class Shared_Cache extends Cache {
 	/**
 	 * get the stored metadata of a file or folder
 	 *
-	 * @param string/int $file
+	 * @param string /int $file
 	 * @return array
 	 */
 	public function get($file) {
@@ -95,8 +96,8 @@ class Shared_Cache extends Cache {
 		} else {
 			$query = \OC_DB::prepare(
 				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,'
-				.' `size`, `mtime`, `encrypted`, `unencrypted_size`'
-				.' FROM `*PREFIX*filecache` WHERE `fileid` = ?');
+				. ' `size`, `mtime`, `encrypted`, `unencrypted_size`'
+				. ' FROM `*PREFIX*filecache` WHERE `fileid` = ?');
 			$result = $query->execute(array($file));
 			$data = $result->fetchRow();
 			$data['fileid'] = (int)$data['fileid'];
@@ -288,8 +289,7 @@ class Shared_Cache extends Cache {
 			foreach ($files as $file) {
 				if ($file['mimetype'] === 'httpd/unix-directory') {
 					$exploreDirs[] = ltrim($dir . '/' . $file['name'], '/');
-				}
-				else if (($mimepart && $file['mimepart'] === $mimepart) || ($mimetype && $file['mimetype'] === $mimetype)) {
+				} else if (($mimepart && $file['mimepart'] === $mimepart) || ($mimetype && $file['mimetype'] === $mimetype)) {
 					// usersPath not reliable
 					//$file['path'] = $file['usersPath'];
 					$file['path'] = ltrim($dir . '/' . $file['name'], '/');
@@ -344,8 +344,6 @@ class Shared_Cache extends Cache {
 				if ($row['encrypted'] or ($row['unencrypted_size'] > 0 and $row['mimetype'] === 'httpd/unix-directory')) {
 					$row['encrypted_size'] = $row['size'];
 					$row['size'] = $row['unencrypted_size'];
-				} else {
-					$row['size'] = $row['size'];
 				}
 				$files[] = $row;
 			}
@@ -357,9 +355,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]);
 		}
@@ -401,4 +400,48 @@ class Shared_Cache extends Cache {
 		return false;
 	}
 
+	/**
+	 * get the path of a file on this storage by it's id
+	 *
+	 * @param int $id
+	 * @param string $pathEnd (optional) used internally for recursive calls
+	 * @return string | null
+	 */
+	public function getPathById($id, $pathEnd = '') {
+		// direct shares are easy
+		if ($path = $this->getShareById($id)) {
+			return $path . $pathEnd;
+		} else {
+			// if the item is a direct share we try and get the path of the parent and append the name of the item to it
+			list($parent, $name) = $this->getParentInfo($id);
+			if ($parent > 0) {
+				return $this->getPathById($parent, '/' . $name . $pathEnd);
+			} else {
+				return null;
+			}
+		}
+	}
+
+	private function getShareById($id) {
+		$item = \OCP\Share::getItemSharedWithBySource('file', $id);
+		if ($item) {
+			return trim($item['file_target'], '/');
+		}
+		$item = \OCP\Share::getItemSharedWithBySource('folder', $id);
+		if ($item) {
+			return trim($item['file_target'], '/');
+		}
+		return null;
+	}
+
+	private function getParentInfo($id) {
+		$sql = 'SELECT `parent`, `name` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
+		$query = \OC_DB::prepare($sql);
+		$result = $query->execute(array($id));
+		if ($row = $result->fetchRow()) {
+			return array($row['parent'], $row['name']);
+		} else {
+			return array(-1, '');
+		}
+	}
 }
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
new file mode 100644
index 00000000000..b602fe3599d
--- /dev/null
+++ b/apps/files_sharing/lib/helper.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace OCA\Files_Sharing;
+
+class Helper {
+
+	/**
+	 * Sets up the filesystem and user for public sharing
+	 * @param string $token string share token
+	 * @param string $relativePath optional path relative to the share
+	 * @param string $password optional password
+	 */
+	public static function setupFromToken($token, $relativePath = null, $password = null) {
+		\OC_User::setIncognitoMode(true);
+
+		$linkItem = \OCP\Share::getShareByToken($token);
+		if($linkItem === false || ($linkItem['item_type'] !== 'file' && $linkItem['item_type'] !== 'folder')) {
+			\OC_Response::setStatus(404);
+			\OC_Log::write('core-preview', 'Passed token parameter is not valid', \OC_Log::DEBUG);
+			exit;
+		}
+
+		if(!isset($linkItem['uid_owner']) || !isset($linkItem['file_source'])) {
+			\OC_Response::setStatus(500);
+			\OC_Log::write('core-preview', 'Passed token seems to be valid, but it does not contain all necessary information . ("' . $token . '")', \OC_Log::WARN);
+			exit;
+		}
+
+		$type = $linkItem['item_type'];
+		$fileSource = $linkItem['file_source'];
+		$shareOwner = $linkItem['uid_owner'];
+		$rootLinkItem = \OCP\Share::resolveReShare($linkItem);
+		$path = null;
+		if (isset($rootLinkItem['uid_owner'])) {
+			\OCP\JSON::checkUserExists($rootLinkItem['uid_owner']);
+			\OC_Util::tearDownFS();
+			\OC_Util::setupFS($rootLinkItem['uid_owner']);
+			$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
+		}
+
+		if ($path === null) {
+			\OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
+			\OC_Response::setStatus(404);
+			\OCP\JSON::error(array('success' => false));
+			exit();
+		}
+
+		if (!isset($linkItem['item_type'])) {
+			\OCP\Util::writeLog('share', 'No item type set for share id: ' . $linkItem['id'], \OCP\Util::ERROR);
+			\OC_Response::setStatus(404);
+			\OCP\JSON::error(array('success' => false));
+			exit();
+		}
+
+		if (isset($linkItem['share_with'])) {
+			if (!self::authenticate($linkItem, $password)) {
+				\OC_Response::setStatus(403);
+				\OCP\JSON::error(array('success' => false));
+				exit();
+			}
+		}
+
+		$basePath = $path;
+		$rootName = basename($path);
+
+		if ($relativePath !== null && \OC\Files\Filesystem::isReadable($basePath . $relativePath)) {
+			$path .= \OC\Files\Filesystem::normalizePath($relativePath);
+		}
+
+		return array(
+			'linkItem' => $linkItem,
+			'basePath' => $basePath,
+			'realPath' => $path
+		);
+	}
+
+	/**
+	 * Authenticate link item with the given password
+	 * or with the session if no password was given.
+	 * @param array $linkItem link item array
+	 * @param string $password optional password
+	 *
+	 * @return true if authorized, false otherwise
+	 */
+	public static function authenticate($linkItem, $password) {
+		if ($password !== null) {
+			if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_LINK) {
+				// Check Password
+				$forcePortable = (CRYPT_BLOWFISH != 1);
+				$hasher = new PasswordHash(8, $forcePortable);
+				if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''),
+											 $linkItem['share_with']))) {
+					return false;
+				} else {
+					// Save item id in session for future requests
+					\OC::$session->set('public_link_authenticated', $linkItem['id']);
+				}
+			} else {
+				\OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
+					.' for share id '.$linkItem['id'], \OCP\Util::ERROR);
+				return false;
+			}
+
+		}
+		else {
+			// not authenticated ?
+			if ( ! \OC::$session->exists('public_link_authenticated')
+				|| \OC::$session->get('public_link_authenticated') !== $linkItem['id']) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index 23ebc9fb811..e3a7679292d 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -135,4 +135,19 @@ class Shared_Updater {
 		}
 	}
 
+	/**
+	 * clean up oc_share table from files which are no longer exists
+	 *
+	 * This fixes issues from updates from files_sharing < 0.3.5.6 (ownCloud 4.5)
+	 * It will just be called during the update of the app
+	 */
+	static public function fixBrokenSharesOnAppUpdate() {
+		// delete all shares where the original file no longer exists
+		$findAndRemoveShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` ' .
+			'WHERE `file_source` NOT IN ( ' .
+				'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `item_type` IN (\'file\', \'folder\'))'
+		);
+		$findAndRemoveShares->execute(array());
+	}
+
 }
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index fe61dd4d5a0..ce51eca6ddb 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -11,31 +11,6 @@ if ($appConfig->getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
 	exit();
 }
 
-function fileCmp($a, $b) {
-	if ($a['type'] == 'dir' and $b['type'] != 'dir') {
-		return -1;
-	} elseif ($a['type'] != 'dir' and $b['type'] == 'dir') {
-		return 1;
-	} else {
-		return strnatcasecmp($a['name'], $b['name']);
-	}
-}
-
-function determineIcon($file, $sharingRoot, $sharingToken) {
-	// for folders we simply reuse the files logic
-	if($file['type'] == 'dir') {
-		return \OCA\Files\Helper::determineIcon($file);
-	}
-
-	$relativePath = substr($file['path'], 6);
-	$relativePath = substr($relativePath, strlen($sharingRoot));
-	if($file['isPreviewAvailable']) {
-		return OCP\publicPreview_icon($relativePath, $sharingToken) . '&c=' . $file['etag'];
-	}
-	$icon = OCP\mimetype_icon($file['mimetype']);
-	return substr($icon, 0, -3) . 'svg';
-}
-
 if (isset($_GET['t'])) {
 	$token = $_GET['t'];
 	$linkItem = OCP\Share::getShareByToken($token, false);
@@ -153,13 +128,6 @@ if (isset($path)) {
 		$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
 		$tmpl->assign('dirToken', $linkItem['token']);
 		$tmpl->assign('sharingToken', $token);
-		$allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE);
-		if ($appConfig->getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
-			$allowPublicUploadEnabled = false;
-		}
-		if ($linkItem['item_type'] !== 'folder') {
-			$allowPublicUploadEnabled = false;
-		}
 
 		$urlLinkIdentifiers= (isset($token)?'&t='.$token:'')
 							.(isset($_GET['dir'])?'&dir='.$_GET['dir']:'')
@@ -170,64 +138,18 @@ if (isset($path)) {
 
 			OCP\Util::addStyle('files', 'files');
 			OCP\Util::addStyle('files', 'upload');
+			OCP\Util::addScript('files', 'breadcrumb');
 			OCP\Util::addScript('files', 'files');
 			OCP\Util::addScript('files', 'filelist');
 			OCP\Util::addscript('files', 'keyboardshortcuts');
 			$files = array();
 			$rootLength = strlen($basePath) + 1;
-			$totalSize = 0;
-			foreach (\OC\Files\Filesystem::getDirectoryContent($path) as $i) {
-				$totalSize += $i['size'];
-				$i['date'] = OCP\Util::formatDate($i['mtime']);
-				if ($i['type'] == 'file') {
-					$fileinfo = pathinfo($i['name']);
-					$i['basename'] = $fileinfo['filename'];
-					if (!empty($fileinfo['extension'])) {
-						$i['extension'] = '.' . $fileinfo['extension'];
-					} else {
-						$i['extension'] = '';
-					}
-				}
-				$i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
-				$i['directory'] = $getPath;
-				$i['permissions'] = OCP\PERMISSION_READ;
-				$i['icon'] = determineIcon($i, $basePath, $token);
-				$files[] = $i;
-			}
-			usort($files, "fileCmp");
-
-			// Make breadcrumb
-			$breadcrumb = array();
-			$pathtohere = '';
-			foreach (explode('/', $getPath) as $i) {
-				if ($i != '') {
-					$pathtohere .= '/' . $i;
-					$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
-				}
-			}
-			$list = new OCP\Template('files', 'part.list', '');
-			$list->assign('files', $files);
-			$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
-			$list->assign('downloadURL',
-				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=');
-			$list->assign('isPublic', true);
-			$list->assign('sharingtoken', $token);
-			$list->assign('sharingroot', $basePath);
-			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-			$breadcrumbNav->assign('breadcrumb', $breadcrumb);
-			$breadcrumbNav->assign('rootBreadCrumb', $rootName);
-			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
 			$maxUploadFilesize=OCP\Util::maxUploadFilesize($path);
-			$fileHeader = (!isset($files) or count($files) > 0);
-			$emptyContent = ($allowPublicUploadEnabled and !$fileHeader);
 
 			$freeSpace=OCP\Util::freeSpace($path);
 			$uploadLimit=OCP\Util::uploadLimit();
 			$folder = new OCP\Template('files', 'index', '');
-			$folder->assign('fileList', $list->fetchPage());
-			$folder->assign('breadcrumb', $breadcrumbNav->fetchPage());
 			$folder->assign('dir', $getPath);
-			$folder->assign('isCreatable', $allowPublicUploadEnabled);
 			$folder->assign('dirToken', $linkItem['token']);
 			$folder->assign('permissions', OCP\PERMISSION_READ);
 			$folder->assign('isPublic',true);
@@ -239,15 +161,11 @@ if (isset($path)) {
 			$folder->assign('uploadLimit', $uploadLimit); // PHP upload limit
 			$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 			$folder->assign('usedSpacePercent', 0);
-			$folder->assign('fileHeader', $fileHeader);
 			$folder->assign('disableSharing', true);
 			$folder->assign('trash', false);
-			$folder->assign('emptyContent', $emptyContent);
-			$folder->assign('ajaxLoad', false);
 			$tmpl->assign('folder', $folder->fetchPage());
 			$maxInputFileSize = OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB'));
-			$allowZip = OCP\Config::getSystemValue('allowZipDownload', true)
-						&& ( $maxInputFileSize === 0 || $totalSize <= $maxInputFileSize);
+			$allowZip = OCP\Config::getSystemValue('allowZipDownload', true);
 			$tmpl->assign('allowZipDownload', intval($allowZip));
 			$tmpl->assign('downloadURL',
 				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index e2bbb548182..e3c5b6e4315 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -886,5 +886,5 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 class TestShareApi extends \OCA\Files\Share\Api {
 	public function correctPathTest($path, $folder) {
 		return self::correctPath($path, $folder);
-}
+	}
 }
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index a75e1860527..47969833ab5 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -246,4 +246,43 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
 		}
 	}
 
+	public function testGetPathByIdDirectShare() {
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		\OC\Files\Filesystem::file_put_contents('test.txt', 'foo');
+		$info = \OC\Files\Filesystem::getFileInfo('test.txt');
+		\OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
+		\OC_Util::tearDownFS();
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue(\OC\Files\Filesystem::file_exists('/Shared/test.txt'));
+		list($sharedStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/Shared/test.txt');
+		/**
+		 * @var \OC\Files\Storage\Shared $sharedStorage
+		 */
+
+		$sharedCache = $sharedStorage->getCache();
+		$this->assertEquals('test.txt', $sharedCache->getPathById($info->getId()));
+	}
+
+	public function testGetPathByIdShareSubFolder() {
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		\OC\Files\Filesystem::mkdir('foo');
+		\OC\Files\Filesystem::mkdir('foo/bar');
+		\OC\Files\Filesystem::touch('foo/bar/test.txt', 'bar');
+		$folderInfo = \OC\Files\Filesystem::getFileInfo('foo');
+		$fileInfo = \OC\Files\Filesystem::getFileInfo('foo/bar/test.txt');
+		\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
+		\OC_Util::tearDownFS();
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue(\OC\Files\Filesystem::file_exists('/Shared/foo'));
+		list($sharedStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/Shared/foo');
+		/**
+		 * @var \OC\Files\Storage\Shared $sharedStorage
+		 */
+
+		$sharedCache = $sharedStorage->getCache();
+		$this->assertEquals('foo', $sharedCache->getPathById($folderInfo->getId()));
+		$this->assertEquals('foo/bar/test.txt', $sharedCache->getPathById($fileInfo->getId()));
+	}
 }
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
new file mode 100644
index 00000000000..79ae4879b64
--- /dev/null
+++ b/apps/files_sharing/tests/updater.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Morris Jobke
+ * @copyright 2014 Morris Jobke <morris.jobke@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Class Test_Files_Sharing_Updater
+ */
+class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
+
+	function setUp() {
+		// some previous tests didn't clean up and therefore this has to be done here
+		// FIXME: DIRTY HACK - TODO: find tests, that don't clean up and fix it there
+		$this->tearDown();
+
+		// add items except one - because this is the test case for the broken share table
+		$addItems = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache` (`storage`, `path_hash`, ' .
+			'`parent`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`) ' .
+			'VALUES (1, ?, 1, 1, 1, 1, 1, 1)');
+		$items = array(1, 3);
+		$fileIds = array();
+		foreach($items as $item) {
+			// the number is used as path_hash
+			$addItems->execute(array($item));
+			$fileIds[] = \OC_DB::insertId('*PREFIX*filecache');
+		}
+
+		$addShares = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`file_source`, `item_type`, `uid_owner`) VALUES (?, \'file\', 1)');
+		// the number is used as item_source
+		$addShares->execute(array($fileIds[0]));
+		$addShares->execute(array(200)); // id of "deleted" file
+		$addShares->execute(array($fileIds[1]));
+	}
+
+	function tearDown() {
+		$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share`');
+		$removeShares->execute();
+		$removeItems = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache`');
+		$removeItems->execute();
+	}
+
+	/**
+	 * @medium
+	 */
+	function testRemoveBrokenShares() {
+		// check if there are just 3 shares (see setUp - precondition: empty table)
+		$countShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share`');
+		$result = $countShares->execute()->fetchOne();
+		$this->assertEquals(3, $result);
+
+		// check if there are just 2 items (see setUp - precondition: empty table)
+		$countItems = \OC_DB::prepare('SELECT COUNT(`fileid`) FROM `*PREFIX*filecache`');
+		$result = $countItems->execute()->fetchOne();
+		$this->assertEquals(2, $result);
+
+		// execute actual code which should be tested
+		\OC\Files\Cache\Shared_Updater::fixBrokenSharesOnAppUpdate();
+
+		// check if there are just 2 shares (one gets killed by the code as there is no filecache entry for this)
+		$countShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share`');
+		$result = $countShares->execute()->fetchOne();
+		$this->assertEquals(2, $result);
+
+		// check if the share of file '200' is removed as there is no entry for this in filecache table
+		$countShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share` WHERE `file_source` = 200');
+		$result = $countShares->execute()->fetchOne();
+		$this->assertEquals(0, $result);
+
+		// check if there are just 2 items
+		$countItems = \OC_DB::prepare('SELECT COUNT(`fileid`) FROM `*PREFIX*filecache`');
+		$result = $countItems->execute()->fetchOne();
+		$this->assertEquals(2, $result);
+	}
+}
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index 124a236bcbd..89a55114524 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -1,30 +1,11 @@
 <?php
 
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem');
-
-// Init owncloud
-
-
 OCP\JSON::checkLoggedIn();
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false;
 $data = array();
 
-// Make breadcrumb
-if($doBreadcrumb) {
-	$breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
-
-	$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
-	$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-	$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=');
-	$breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
-
-	$data['breadcrumb'] = $breadcrumbNav->fetchPage();
-}
-
 // make filelist
 try {
 	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
@@ -33,19 +14,11 @@ try {
 	exit();
 }
 
-$dirlisting = false;
-if ($dir && $dir !== '/') {
-    $dirlisting = true;
-}
-
 $encodedDir = \OCP\Util::encodePath($dir);
-$list = new OCP\Template('files_trashbin', 'part.list', '');
-$list->assign('files', $files, false);
-$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
-$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
-$list->assign('dirlisting', $dirlisting);
-$list->assign('disableDownloadActions', true);
-$data['files'] = $list->fetchPage();
+
+$data['permissions'] = 0;
+$data['directory'] = $dir;
+$data['files'] = \OCA\Files_Trashbin\Helper::formatFileInfos($files);
 
 OCP\JSON::success(array('data' => $data));
 
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
index ce64d9ecc9f..32905b2a71c 100644
--- a/apps/files_trashbin/ajax/preview.php
+++ b/apps/files_trashbin/ajax/preview.php
@@ -34,7 +34,7 @@ try{
 	if ($view->is_dir($file)) {
 		$mimetype = 'httpd/unix-directory';
 	} else {
-		$pathInfo = pathinfo($file);
+		$pathInfo = pathinfo(ltrim($file, '/'));
 		$fileName = $pathInfo['basename'];
 		// if in root dir
 		if ($pathInfo['dirname'] === '.') {
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 9c3ccba7ed8..2b00078669e 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -19,7 +19,7 @@ if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true') {
 	foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir) as $file) {
 		$fileName = $file['name'];
 		if (!$dirListing) {
-			$fileName .= '.d' . $file['timestamp'];
+			$fileName .= '.d' . $file['mtime'];
 		}
 		$list[] = $fileName;
 	}
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 97819f4e80b..7ca3e355fc2 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -1,3 +1,4 @@
-#fileList td a.file, #fileList td a.file span {
+#fileList tr[data-type="file"] td a.name,
+#fileList tr[data-type="file"] td a.name span {
     cursor: default;
 }
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index f0c5b0508b8..e63fe1e4188 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -11,6 +11,7 @@ $tmpl = new OCP\Template('files_trashbin', 'index', 'user');
 
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addStyle('files_trashbin', 'trash');
+OCP\Util::addScript('files', 'breadcrumb');
 OCP\Util::addScript('files', 'filelist');
 // filelist overrides
 OCP\Util::addScript('files_trashbin', 'filelist');
@@ -34,48 +35,7 @@ if ($isIE8 && isset($_GET['dir'])){
 	exit();
 }
 
-$ajaxLoad = false;
-
-if (!$isIE8){
-	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;
-}
-
-$dirlisting = false;
-if ($dir && $dir !== '/') {
-    $dirlisting = true;
-}
-
-$breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
-
-$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
-$breadcrumbNav->assign('breadcrumb', $breadcrumb);
-$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=');
-$breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
-
-$list = new OCP\Template('files_trashbin', 'part.list', '');
-$list->assign('files', $files);
-
-$encodedDir = \OCP\Util::encodePath($dir);
-$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
-$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$encodedDir);
-$list->assign('dirlisting', $dirlisting);
-$list->assign('disableDownloadActions', true);
-
-$tmpl->assign('dirlisting', $dirlisting);
-$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
-$tmpl->assign('fileList', $list->fetchPage());
-$tmpl->assign('files', $files);
 $tmpl->assign('dir', $dir);
 $tmpl->assign('disableSharing', true);
-$tmpl->assign('ajaxLoad', true);
 
 $tmpl->printPage();
diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
index afa80cacd6b..50ceaf4696f 100644
--- a/apps/files_trashbin/js/disableDefaultActions.js
+++ b/apps/files_trashbin/js/disableDefaultActions.js
@@ -1,4 +1,3 @@
 /* disable download and sharing actions */
 var disableDownloadActions = true;
-var disableSharing = true;
 var trashBinApp = true;
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index a88459b0a9a..7795daf2775 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -1,61 +1,78 @@
-/* globals OC, FileList, t */
-// override reload with own ajax call
-FileList.reload = function(){
-	FileList.showMask();
-	if (FileList._reloadCall){
-		FileList._reloadCall.abort();
-	}
-	$.ajax({
-		url: OC.filePath('files_trashbin','ajax','list.php'),
-		data: {
-			dir : $('#dir').val(),
-			breadcrumb: true
-		},
-		error: function(result) {
-			FileList.reloadCallback(result);
-		},
-		success: function(result) {
-			FileList.reloadCallback(result);
+/* global OC, t, FileList */
+(function() {
+	FileList.appName = t('files_trashbin', 'Deleted files');
+
+	FileList._deletedRegExp = new RegExp(/^(.+)\.d[0-9]+$/);
+
+	/**
+	 * Convert a file name in the format filename.d12345 to the real file name.
+	 * This will use basename.
+	 * The name will not be changed if it has no ".d12345" suffix.
+	 * @param name file name
+	 * @return converted file name
+	 */
+	FileList.getDeletedFileName = function(name) {
+		name = OC.basename(name);
+		var match = FileList._deletedRegExp.exec(name);
+		if (match && match.length > 1) {
+			name = match[1];
 		}
-	});
-};
-
-FileList.appName = t('files_trashbin', 'Deleted files');
-
-FileList._deletedRegExp = new RegExp(/^(.+)\.d[0-9]+$/);
-
-/**
- * Convert a file name in the format filename.d12345 to the real file name.
- * This will use basename.
- * The name will not be changed if it has no ".d12345" suffix.
- * @param name file name
- * @return converted file name
- */
-FileList.getDeletedFileName = function(name) {
-	name = OC.basename(name);
-	var match = FileList._deletedRegExp.exec(name);
-	if (match && match.length > 1) {
-		name = match[1];
-	}
-	return name;
-};
-var oldSetCurrentDir = FileList.setCurrentDir;
-FileList.setCurrentDir = function(targetDir) {
-	oldSetCurrentDir.apply(this, arguments);
-
-	var baseDir = OC.basename(targetDir);
-	if (baseDir !== '') {
-		FileList.setPageTitle(FileList.getDeletedFileName(baseDir));
-	}
-};
-
-FileList.linkTo = function(dir){
-	return OC.linkTo('files_trashbin', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
-}
-
-FileList.updateEmptyContent = function(){
-	var $fileList = $('#fileList');
-	var exists = $fileList.find('tr:first').exists();
-	$('#emptycontent').toggleClass('hidden', exists);
-	$('#filestable th').toggleClass('hidden', !exists);
-}
+		return name;
+	};
+
+	var oldSetCurrentDir = FileList._setCurrentDir;
+	FileList._setCurrentDir = function(targetDir) {
+		oldSetCurrentDir.apply(this, arguments);
+
+		var baseDir = OC.basename(targetDir);
+		if (baseDir !== '') {
+			FileList.setPageTitle(FileList.getDeletedFileName(baseDir));
+		}
+	};
+
+	var oldCreateRow = FileList._createRow;
+	FileList._createRow = function() {
+		// FIXME: MEGAHACK until we find a better solution
+		var tr = oldCreateRow.apply(this, arguments);
+		tr.find('td.filesize').remove();
+		return tr;
+	};
+
+	FileList._onClickBreadCrumb = function(e) {
+		var $el = $(e.target).closest('.crumb'),
+			index = $el.index(),
+			$targetDir = $el.data('dir');
+		// first one is home, let the link makes it default action
+		if (index !== 0) {
+			e.preventDefault();
+			FileList.changeDirectory($targetDir);
+		}
+	};
+
+	var oldAdd = FileList.add;
+	FileList.add = function(fileData, options) {
+		options = options || {};
+		var dir = FileList.getCurrentDirectory();
+		var dirListing = dir !== '' && dir !== '/';
+		// show deleted time as mtime
+		if (fileData.mtime) {
+			fileData.mtime = parseInt(fileData.mtime, 10);
+		}
+		if (!dirListing) {
+			fileData.displayName = fileData.name;
+			fileData.name = fileData.name + '.d' + Math.floor(fileData.mtime / 1000);
+		}
+		return oldAdd.call(this, fileData, options);
+	};
+
+	FileList.linkTo = function(dir){
+		return OC.linkTo('files_trashbin', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+	};
+
+	FileList.updateEmptyContent = function(){
+		var $fileList = $('#fileList');
+		var exists = $fileList.find('tr:first').exists();
+		$('#emptycontent').toggleClass('hidden', exists);
+		$('#filestable th').toggleClass('hidden', !exists);
+	};
+})();
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 6aade210505..5cd49e19aaa 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -8,9 +8,26 @@
  *
  */
 
-/* global OC, t, FileList, FileActions */
-
+/* global OC, t, BreadCrumb, FileActions, FileList, Files */
 $(document).ready(function() {
+	var deletedRegExp = new RegExp(/^(.+)\.d[0-9]+$/);
+
+	/**
+	 * Convert a file name in the format filename.d12345 to the real file name.
+	 * This will use basename.
+	 * The name will not be changed if it has no ".d12345" suffix.
+	 * @param name file name
+	 * @return converted file name
+	 */
+	function getDeletedFileName(name) {
+		name = OC.basename(name);
+		var match = deletedRegExp.exec(name);
+		if (match && match.length > 1) {
+			name = match[1];
+		}
+		return name;
+	}
+
 	function removeCallback(result) {
 		if (result.status !== 'success') {
 			OC.dialogs.alert(result.data.message, t('core', 'Error'));
@@ -18,13 +35,18 @@ $(document).ready(function() {
 
 		var files = result.data.success;
 		for (var i = 0; i < files.length; i++) {
-			FileList.findFileEl(OC.basename(files[i].filename)).remove();
+			FileList.remove(OC.basename(files[i].filename), {updateSummary: false});
 		}
 		FileList.updateFileSummary();
 		FileList.updateEmptyContent();
 		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);
@@ -69,7 +91,6 @@ $(document).ready(function() {
 		}
 		procesSelection();
 	});
-
 	$('.undelete').click('click', function(event) {
 		event.preventDefault();
 		var allFiles = $('#select_all').is(':checked');
@@ -84,7 +105,7 @@ $(document).ready(function() {
 			};
 		}
 		else {
-			files = getSelectedFiles('name');
+			files = Files.getSelectedFiles('name');
 			for (var i = 0; i < files.length; i++) {
 				var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete");
 				deleteAction.removeClass('delete-icon').addClass('progress-icon');
@@ -126,7 +147,7 @@ $(document).ready(function() {
 			};
 		}
 		else {
-			files = getSelectedFiles('name');
+			files = Files.getSelectedFiles('name');
 			params = {
 				files: JSON.stringify(files),
 				dir: FileList.getCurrentDirectory()
@@ -153,7 +174,7 @@ $(document).ready(function() {
 						}
 						FileList.hideMask();
 						// simply remove all files
-						FileList.update('');
+						FileList.setFiles([]);
 						enableActions();
 					}
 					else {
@@ -186,7 +207,7 @@ $(document).ready(function() {
 		var filename = $(this).parent().parent().attr('data-file');
 		var tr = FileList.findFileEl(filename);
 		var renaming = tr.data('renaming');
-		if(!renaming && !FileList.isLoading(filename)){
+		if(!renaming){
 			if(mime.substr(0, 5) === 'text/'){ //no texteditor for now
 				return;
 			}
@@ -198,47 +219,61 @@ $(document).ready(function() {
 				action(filename);
 			}
 		}
-
-		// event handlers for breadcrumb items
-		$('#controls').delegate('.crumb:not(.home) a', 'click', onClickBreadcrumb);
 	});
 
-	FileActions.actions.dir = {
-		// only keep 'Open' action for navigation
-		'Open': FileActions.actions.dir.Open
+	/**
+	 * Override crumb URL maker (hacky!)
+	 */
+	FileList.breadcrumb.getCrumbUrl = function(part, index) {
+		if (index === 0) {
+			return OC.linkTo('files', 'index.php');
+		}
+		return OC.linkTo('files_trashbin', 'index.php')+"?dir=" + encodeURIComponent(part.dir);
 	};
-});
 
-/**
- * @brief get a list of selected files
- * @param string property (option) the property of the file requested
- * @return array
- *
- * possible values for property: name, mime, size and type
- * if property is set, an array with that property for each file is returnd
- * if it's ommited an array of objects with all properties is returned
- */
-function getSelectedFiles(property){
-	var elements=$('td.filename input:checkbox:checked').parent().parent();
-	var files=[];
-	elements.each(function(i,element){
-		var file={
-			name:$(element).attr('data-file'),
-			timestamp:$(element).attr('data-timestamp'),
-			type:$(element).attr('data-type')
+	Files.generatePreviewUrl = function(urlSpec) {
+		return OC.generateUrl('/apps/files_trashbin/ajax/preview.php?') + $.param(urlSpec);
+	};
+
+	Files.getDownloadUrl = function(action, params) {
+		// no downloads
+		return '#';
+	};
+
+	Files.getAjaxUrl = function(action, params) {
+		var q = '';
+		if (params) {
+			q = '?' + OC.buildQueryString(params);
+		}
+		return OC.filePath('files_trashbin', 'ajax', action + '.php') + q;
+	};
+
+
+	/**
+	 * Override crumb making to add "Deleted Files" entry
+	 * and convert files with ".d" extensions to a more
+	 * user friendly name.
+	 */
+	var oldMakeCrumbs = BreadCrumb.prototype._makeCrumbs;
+	BreadCrumb.prototype._makeCrumbs = function() {
+		var parts = oldMakeCrumbs.apply(this, arguments);
+		// duplicate first part
+		parts.unshift(parts[0]);
+		parts[1] = {
+			dir: '/',
+			name: t('files_trashbin', 'Deleted Files')
 		};
-		if(property){
-			files.push(file[property]);
-		}else{
-			files.push(file);
+		for (var i = 2; i < parts.length; i++) {
+			parts[i].name = getDeletedFileName(parts[i].name);
 		}
-	});
-	return files;
-}
+		return parts;
+	};
 
-function fileDownloadPath(dir, file) {
-	return OC.filePath('files_trashbin', '', 'download.php') + '?file='+encodeURIComponent(file);
-}
+	FileActions.actions.dir = {
+		// only keep 'Open' action for navigation
+		'Open': FileActions.actions.dir.Open
+	};
+});
 
 function enableActions() {
 	$(".action").css("display", "inline");
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index 68c51d1cc7d..4084daa127a 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
 "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/ast.php b/apps/files_trashbin/l10n/ast.php
new file mode 100644
index 00000000000..91c122bd4d3
--- /dev/null
+++ b/apps/files_trashbin/l10n/ast.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "Fallu",
+"Name" => "Nome",
+"Restore" => "Restaurar",
+"Delete" => "Desaniciar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index c1234cdfb0c..ff4227e38c7 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -1,15 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s alıcı olarak silinemedi",
-"Couldn't restore %s" => "%s eri yüklenemedi",
+"Couldn't restore %s" => "%s geri yüklenemedi",
 "Deleted files" => "Silinmiş dosyalar",
 "Error" => "Hata",
+"Deleted Files" => "Silinen Dosyalar",
 "restored" => "geri yüklendi",
 "Nothing in here. Your trash bin is empty!" => "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!",
 "Name" => "İsim",
 "Restore" => "Geri yükle",
 "Deleted" => "Silindi",
-"Delete" => "Sil",
-"Deleted Files" => "Silinen Dosyalar"
+"Delete" => "Sil"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index 9c24332a964..e6ca73520a6 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -27,6 +27,10 @@ class Helper
 		if ($dirContent === false) {
 			return $result;
 		}
+
+		list($storage, $internalPath) = $view->resolvePath($dir);
+		$absoluteDir = $view->getAbsolutePath($dir);
+
 		if (is_resource($dirContent)) {
 			while (($entryName = readdir($dirContent)) !== false) {
 				if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
@@ -40,76 +44,41 @@ class Helper
 						$parts = explode('/', ltrim($dir, '/'));
 						$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
 					}
-					$result[] = array(
-						'id' => $id,
-						'timestamp' => $timestamp,
-						'mime' => \OC_Helper::getFileNameMimeType($id),
+					$i = array(
+						'name' => $id,
+						'mtime' => $timestamp,
+						'mimetype' => \OC_Helper::getFileNameMimeType($id),
 						'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file',
-						'location' => $dir,
+						'directory' => ($dir === '/') ? '' : $dir,
 					);
+					$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i);
 				}
 			}
 			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') {
-				$fileinfo = pathinfo($r['id']);
-				$i['basename'] = $fileinfo['filename'];
-				$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
-			}
-			$i['directory'] = $r['location'];
-			if ($i['directory'] === '/') {
-				$i['directory'] = '';
-			}
-			$i['permissions'] = \OCP\PERMISSION_READ;
-			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[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i);
-		}
-
-		usort($files, array('\OCA\Files\Helper', 'fileCmp'));
+		usort($result, array('\OCA\Files\Helper', 'fileCmp'));
 
-		return $files;
+		return $result;
 	}
 
 	/**
-	 * Splits the given path into a breadcrumb structure.
-	 * @param string $dir path to process
-	 * @return array where each entry is a hash of the absolute
-	 * directory path and its name
+	 * Format file infos for JSON
+	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
 	 */
-	public static function makeBreadcrumb($dir){
-		// Make breadcrumb
-		$pathtohere = '';
-		$breadcrumb = array();
-		foreach (explode('/', $dir) as $i) {
-			if ($i !== '') {
-				if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
-					$name = $match[1];
-				} else {
-					$name = $i;
-				}
-				$pathtohere .= '/' . $i;
-				$breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
+	public static function formatFileInfos($fileInfos) {
+		$files = array();
+		$id = 0;
+		foreach ($fileInfos as $i) {
+			$entry = \OCA\Files\Helper::formatFileInfo($i);
+			$entry['id'] = $id++;
+			$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
+			$entry['permissions'] = \OCP\PERMISSION_READ;
+			if (\OCP\App::isEnabled('files_encryption')) {
+				$entry['isPreviewAvailable'] = false;
 			}
+			$files[] = $entry;
 		}
-		return $breadcrumb;
+		return $files;
 	}
 }
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 7e91f8a59ff..7b14a4ec081 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -78,8 +78,8 @@ 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);
 
 
@@ -117,7 +117,7 @@ class Trashbin {
 		$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)) {
@@ -145,7 +145,7 @@ class Trashbin {
 		$userTrashSize -= self::expire($userTrashSize, $user);
 
 		// if owner !== user we also need to update the owners trash size
-		if($owner !== $user) {
+		if ($owner !== $user) {
 			$ownerTrashSize = self::getTrashbinSize($owner);
 			$ownerTrashSize += $size;
 			$ownerTrashSize -= self::expire($ownerTrashSize, $owner);
@@ -298,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
@@ -312,7 +313,7 @@ class Trashbin {
 		$location = '';
 		if ($timestamp) {
 			$query = \OC_DB::prepare('SELECT `location` FROM `*PREFIX*files_trash`'
-							. ' WHERE `user`=? AND `id`=? AND `timestamp`=?');
+				. ' 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);
@@ -320,8 +321,9 @@ class Trashbin {
 				$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))) {
+					(!$view->is_dir('files' . $location) ||
+						!$view->isUpdatable('files' . $location))
+				) {
 					$location = '';
 				}
 			}
@@ -631,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
@@ -720,6 +723,7 @@ class Trashbin {
 
 	/**
 	 * clean up the trash bin
+	 *
 	 * @param int $trashbinSize current size of the trash bin
 	 * @param string $user
 	 * @return int size of expired files
@@ -755,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;
@@ -803,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
 	 */
@@ -822,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;
@@ -833,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
@@ -850,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++;
 			}
 
@@ -915,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_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index f9264d4352c..b6c61c9b1c3 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -1,12 +1,11 @@
 <div id="controls">
-	<?php print_unescaped($_['breadcrumb']); ?>
-		<div id="file_action_panel"></div>
+	<div id="file_action_panel"></div>
 </div>
 <div id='notification'></div>
 
-<div id="emptycontent" <?php if (!(isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false && !$_['ajaxLoad'])):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
+<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
 
-<input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
+<input type="hidden" id="permissions" value="0"></input>
 <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input>
 <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 
@@ -40,6 +39,5 @@
 		</tr>
 	</thead>
 	<tbody id="fileList">
-		<?php print_unescaped($_['fileList']); ?>
 	</tbody>
 </table>
diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php
deleted file mode 100644
index fdf78c190d0..00000000000
--- a/apps/files_trashbin/templates/part.breadcrumb.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="crumb home">
-		<a href="<?php print_unescaped($_['home']); ?>">
-			<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
-		</a>
-</div>
-<div class="crumb svg"
-	 data-dir='/'>
-	<a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a>
-</div>
-<?php if(count($_["breadcrumb"])):?>
-<?php endif;?>
-<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
-	$crumb = $_["breadcrumb"][$i];
-	$dir = \OCP\Util::encodePath($crumb["dir"]); ?>
-	<div class="crumb <?php if($i === count($_["breadcrumb"])-1) p('last');?> svg"
-		 data-dir='<?php p($dir);?>'>
-	<a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
-	</div>
-<?php endfor;
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
deleted file mode 100644
index c32d9fd54da..00000000000
--- a/apps/files_trashbin/templates/part.list.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php foreach($_['files'] as $file):
-	$relative_deleted_date = OCP\relative_modified_date($file['timestamp']);
-	// the older the file, the brighter the shade of grey; days*14
-	$relative_date_color = round((time()-$file['date'])/60/60/24*14);
-	if($relative_date_color>200) $relative_date_color = 200;
-	$name = \OCP\Util::encodePath($file['name']);
-	$directory = \OCP\Util::encodePath($file['directory']); ?>
-	<tr data-filename="<?php p($file['name']);?>"
-		data-type="<?php ($file['type'] === 'dir')?p('dir'):p('file')?>"
-		data-mime="<?php p($file['mimetype'])?>"
-		data-permissions='<?php p($file['permissions']); ?>'
-		<?php if ( $_['dirlisting'] ): ?>
-		id="<?php p($file['directory'].'/'.$file['name']);?>"
-		data-file="<?php p($name);?>"
-		data-timestamp=''
-		data-dirlisting=1
-		<?php  else: ?>
-		id="<?php p($file['name'].'.d'.$file['timestamp']);?>"
-		data-file="<?php p($file['name'].'.d'.$file['timestamp']);?>"
-		data-timestamp='<?php p($file['timestamp']);?>'
-		data-dirlisting=0
-		<?php endif; ?>>
-		<?php if($file['isPreviewAvailable']): ?>
-		<td class="filename svg preview-icon"
-		<?php else: ?>
-		<td class="filename svg"
-		<?php endif; ?>
-		<?php if($file['type'] === 'dir'): ?>
-			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
-		<?php else: ?>
-				<?php if($file['isPreviewAvailable']): ?>
-				style="background-image:url(<?php print_unescaped(OCA\Files_Trashbin\Trashbin::preview_icon(!$_['dirlisting'] ? ($file['name'].'.d'.$file['timestamp']) : ($file['directory'].'/'.$file['name']))); ?>)"
-				<?php else: ?>
-				style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
-				<?php endif; ?>
-		<?php endif; ?>
-			>
-		<?php if(!isset($_['readonly']) || !$_['readonly']): ?>
-			<input id="select-<?php p($file['id']); ?>" type="checkbox" />
-			<label for="select-<?php p($file['id']); ?>"></label>
-		<?php endif; ?>
-		<?php if($file['type'] === 'dir'): ?>
-			<?php if( $_['dirlisting'] ): ?>
-				<a class="name dir" href="<?php p($_['baseURL'].'/'.$name); ?>" title="">
-			<?php else: ?>
-				<a class="name dir" href="<?php p($_['baseURL'].'/'.$name.'.d'.$file['timestamp']); ?>" title="">
-			<?php endif; ?>
-		<?php else: ?>
-			<?php if( $_['dirlisting'] ): ?>
-				<a class="name file" href="<?php p($_['downloadURL'].'/'.$name); ?>" title="">
-			<?php else: ?>
-				<a class="name file" href="<?php p($_['downloadURL'].'/'.$name.'.d'.$file['timestamp']);?>" title="">
-			<?php endif; ?>
-		<?php endif; ?>
-			<span class="nametext">
-				<?php if($file['type'] === 'dir'):?>
-					<?php print_unescaped(htmlspecialchars($file['name']));?>
-				<?php else:?>
-					<?php print_unescaped(htmlspecialchars($file['basename']));?><span
-						class='extension'><?php p($file['extension']);?></span>
-				<?php endif;?>
-			</span>
-			<?php if($file['type'] === 'dir'):?>
-				<span class="uploadtext" currentUploads="0">
-				</span>
-			<?php endif;?>
-			</a>
-		</td>
-		<td class="date">
-			<span class="modified"
-				  title="<?php p($file['date']); ?>"
-				  style="color:rgb(<?php p($relative_date_color.','
-												.$relative_date_color.','
-												.$relative_date_color) ?>)">
-				<?php p($relative_deleted_date); ?>
-			</span>
-		</td>
-	</tr>
-<?php endforeach;
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 661d64aa979..a735caee945 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 4adf14745de..b452bc25b13 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/ast.php b/apps/files_versions/l10n/ast.php
new file mode 100644
index 00000000000..4869d70b54d
--- /dev/null
+++ b/apps/files_versions/l10n/ast.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"Versions" => "Versiones",
+"More versions..." => "Más versiones...",
+"No other versions available" => "Nun hai otres versiones disponibles",
+"Restore" => "Restaurar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 9cc908e8522..e4a4375a737 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/group_ldap.php b/apps/user_ldap/group_ldap.php
index cef9ca3c4cf..4f2424d9531 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -299,9 +299,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	 * @brief get a list of all groups
 	 * @returns array with group names
 	 *
-	 * Returns a list with all groups
+	 * Returns a list with all groups (used by getGroups)
 	 */
-	public function getGroups($search = '', $limit = -1, $offset = 0) {
+	protected function getGroupsChunk($search = '', $limit = -1, $offset = 0) {
 		if(!$this->enabled) {
 			return array();
 		}
@@ -334,6 +334,48 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		return $ldap_groups;
 	}
 
+	/**
+	 * @brief get a list of all groups using a paged search
+	 * @returns array with group names
+	 *
+	 * Returns a list with all groups
+   	 * Uses a paged search if available to override a
+   	 * server side search limit.
+   	 * (active directory has a limit of 1000 by default)
+	 */
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
+		if(!$this->enabled) {
+			return array();
+		}
+		$pagingsize = $this->access->connection->ldapPagingSize;
+		if ((! $this->access->connection->hasPagedResultSupport)
+		   	|| empty($pagingsize)) {
+			return $this->getGroupsChunk($search, $limit, $offset);
+		}
+		$maxGroups = 100000; // limit max results (just for safety reasons)
+		if ($limit > -1) {
+		   $overallLimit = min($limit, $maxGroups);
+		} else {
+		   $overallLimit = $maxGroups;
+		}
+		$chunkOffset = $offset;
+		$allGroups = array();
+		while ($chunkOffset < $overallLimit) {
+			$chunkLimit = min($pagingsize, $overallLimit - $chunkOffset);
+			$ldapGroups = $this->getGroupsChunk($search, $chunkLimit, $chunkOffset);
+			$nread = count($ldapGroups);
+			\OCP\Util::writeLog('user_ldap', 'getGroups('.$search.'): read '.$nread.' at offset '.$chunkOffset.' (limit: '.$chunkLimit.')', \OCP\Util::DEBUG);
+			if ($nread) {
+				$allGroups = array_merge($allGroups, $ldapGroups);
+				$chunkOffset += $nread;
+			}
+			if ($nread < $chunkLimit) {
+				break;
+			}
+		}
+		return $allGroups;
+	}
+
 	public function groupMatchesFilter($group) {
 		return (strripos($group, $this->groupSearch) !== false);
 	}
diff --git a/apps/user_ldap/l10n/am_ET.php b/apps/user_ldap/l10n/am_ET.php
new file mode 100644
index 00000000000..3a1e002311c
--- /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 2b0cbbd75a5..a2152dde852 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/ast.php b/apps/user_ldap/l10n/ast.php
new file mode 100644
index 00000000000..2c022880019
--- /dev/null
+++ b/apps/user_ldap/l10n/ast.php
@@ -0,0 +1,11 @@
+<?php
+$TRANSLATIONS = array(
+"Deletion failed" => "Falló'l borráu",
+"Error" => "Fallu",
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("",""),
+"Save" => "Guardar",
+"Password" => "Contraseña",
+"Continue" => "Continuar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/az.php b/apps/user_ldap/l10n/az.php
index bba52d53a1a..3a1e002311c 100644
--- a/apps/user_ldap/l10n/az.php
+++ b/apps/user_ldap/l10n/az.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array("")
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
 );
-$PLURAL_FORMS = "nplurals=1; plural=0;";
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 930a4b10647..536834ee8b5 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -33,12 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Uložit",
 "Test Configuration" => "Vyzkoušet nastavení",
 "Help" => "Nápověda",
+"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",
+"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:",
@@ -53,6 +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 %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",
@@ -85,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 8dad9b34539..fd6bde8a97e 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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.)",
+"Paging chunksize" => "Seitenstücke (Paging chunksize)",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
 "Special Attributes" => "Spezielle Eigenschaften",
 "Quota Field" => "Kontingent Feld",
 "Quota Default" => "Standard Kontingent",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 6e6e29ea3db..8c6ba0f3130 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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.)",
+"Paging chunksize" => "Seitenstücke (Paging chunksize)",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
 "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 1e975911953..926419d86b2 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -33,12 +33,14 @@ $TRANSLATIONS = array(
 "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" => "Πρωτογενές φίλτρο ",
 "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:" => "Άλλες Ιδιότητες:",
@@ -53,6 +55,7 @@ $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 %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" => "Επιστροφή",
@@ -85,6 +88,7 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Μια ομαδικη Βάση DN ανά γραμμή",
 "Group Search Attributes" => "Ομάδα Χαρακτηριστικων Αναζήτηση",
 "Group-Member association" => "Group-Member association",
+"Nested Groups" => "Φωλιασμένες ομάδες",
 "Special Attributes" => "Ειδικά Χαρακτηριστικά ",
 "Quota Field" => "Ποσοσταση πεδιου",
 "Quota Default" => "Προκαθισμενο πεδιο",
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
index 4421a8035ca..b87c99c135c 100644
--- a/apps/user_ldap/l10n/en_GB.php
+++ b/apps/user_ldap/l10n/en_GB.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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.)",
+"Paging chunksize" => "Paging chunksize",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)",
 "Special Attributes" => "Special Attributes",
 "Quota Field" => "Quota Field",
 "Quota Default" => "Quota Default",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 090accceda0..9bf3a189efd 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -33,12 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Salvesta",
 "Test Configuration" => "Testi seadistust",
 "Help" => "Abiinfo",
+"Groups meeting these criteria are available in %s:" => "Kriteeriumiga sobivad grupid on saadaval %s:",
 "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",
+"Users login with this attribute:" => "Logimiseks kasutatkse atribuuti: ",
 "LDAP Username:" => "LDAP kasutajanimi:",
 "LDAP Email Address:" => "LDAP e-posti aadress:",
 "Other Attributes:" => "Muud atribuudid:",
@@ -53,6 +55,7 @@ $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 %s access to users meeting these criteria:" => "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
 "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",
@@ -85,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Üks grupi baas-DN rea kohta",
 "Group Search Attributes" => "Grupi otsingu atribuudid",
 "Group-Member association" => "Grupiliikme seotus",
+"Nested Groups" => "Sisegrupp",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Sisse lülitamisel on toetatakse gruppe sisaldavad gruppe. (Toimib, kui grupi liikme atribuut sisaldab DN-e.)",
 "Special Attributes" => "Spetsiifilised atribuudid",
 "Quota Field" => "Mahupiirangu atribuut",
 "Quota Default" => "Vaikimisi mahupiirang",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index dbcaadfc2a7..39e7d2ae429 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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).",
+"Paging chunksize" => "Dimensionnement des paginations",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)",
 "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 802c6d0e435..c3524453899 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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.)",
+"Paging chunksize" => "Tamaño dos fragmentos paxinados",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Tamaño dos fragmentos utilizados para as buscas LDAP paxinadas, que poden devolver resultados voluminosos como usuario ou enumeración de grupo. (Se se establece a 0, desactívanse as buscas LDAP paxinadas nesas situacións.)",
 "Special Attributes" => "Atributos especiais",
 "Quota Field" => "Campo de cota",
 "Quota Default" => "Cota predeterminada",
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 4436127747f..de540f22821 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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.)",
+"Paging chunksize" => "Dimensione del blocco di paginazione",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Dimensione del blocco per le ricerche LDAP paginate che potrebbero restituire risultati pesanti come l'enumerazione di utenti o gruppi.(L'impostazione a 0 disabilita le ricerche LDAP paginate in questi casi.)",
 "Special Attributes" => "Attributi speciali",
 "Quota Field" => "Campo Quota",
 "Quota Default" => "Quota predefinita",
diff --git a/apps/user_ldap/l10n/jv.php b/apps/user_ldap/l10n/jv.php
new file mode 100644
index 00000000000..3a1e002311c
--- /dev/null
+++ b/apps/user_ldap/l10n/jv.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/nl.php b/apps/user_ldap/l10n/nl.php
index 55e4e07033a..d1ffd4f00d4 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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)",
+"Paging chunksize" => "Paging chunkgrootte",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "De chunkgrootte die wordt gebruikt voor LDAP opvragingen die in grote aantallen resulteren, zoals gebruiker- of groepsverzamelingen. (Instellen op 0 deactiveert gepagede LDAP opvragingen in dergelijke situaties.)",
 "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 5c6d3d7022e..69a94ec693c 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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)",
+"Paging chunksize" => "Wielkość stronicowania",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Długość łańcucha jest używana do stronicowanych wyszukiwań LDAP, które mogą zwracać duże zbiory jak lista grup, czy użytkowników. (Ustawienie na 0 wyłącza stronicowane wyszukiwania w takich sytuacjach.)",
 "Special Attributes" => "Specjalne atrybuty",
 "Quota Field" => "Pole przydziału",
 "Quota Default" => "Przydział domyślny",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 786bee4c8ae..844024a953d 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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.)",
+"Paging chunksize" => "Bloco de paginação",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como usuário ou grupo de enumeração. (Defini-lo 0 desativa paginada pesquisas LDAP nessas situações.)",
 "Special Attributes" => "Atributos Especiais",
 "Quota Field" => "Campo de Cota",
 "Quota Default" => "Cota Padrão",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index b2a21b6e029..b6df62ffb79 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -85,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/sv.php b/apps/user_ldap/l10n/sv.php
index 0108cfcb0e4..6a4ed0c7204 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -33,12 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Spara",
 "Test Configuration" => "Testa konfigurationen",
 "Help" => "Hjälp",
+"Groups meeting these criteria are available in %s:" => "Grupper som uppfyller dessa kriterier finns i %s:",
 "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",
+"Users login with this attribute:" => "Användare loggar in med detta attribut:",
 "LDAP Username:" => "LDAP användarnamn:",
 "LDAP Email Address:" => "LDAP e-postadress:",
 "Other Attributes:" => "Övriga attribut:",
@@ -53,6 +55,7 @@ $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 %s access to users meeting these criteria:" => "Begränsa %s tillgång till användare som uppfyller dessa kriterier:",
 "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",
@@ -85,6 +88,10 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "En Grupp start DN per rad",
 "Group Search Attributes" => "Gruppsökningsattribut",
 "Group-Member association" => "Attribut för gruppmedlemmar",
+"Nested Groups" => "Undergrupper",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "När den är påslagen, stöds grupper som innehåller grupper. (Fungerar endast om gruppmedlemmens attribut innehåller DNs.)",
+"Paging chunksize" => "Paging klusterstorlek",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Klusterstorlek som används för paged LDAP sökningar som kan komma att returnera skrymmande resultat som uppräknande av användare eller grupper. (Inställning av denna till 0 inaktiverar paged LDAP sökningar i de situationerna)",
 "Special Attributes" => "Specialattribut",
 "Quota Field" => "Kvotfält",
 "Quota Default" => "Datakvot standard",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index fa829a7427c..d654b4e2416 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
 "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).",
+"Paging chunksize" => "Sayfalama yığın boyutu",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Yığın boyutu, kullanıcı veya grup numaralandırması benzeri hantal sonuçlar döndürebilen sayfalandırılmış LDAP aramaları için kullanılır. (0 yapmak bu durumlarda sayfalandırılmış LDAP aramalarını devre dışı bırakır.)",
 "Special Attributes" => "Özel Öznitelikler",
 "Quota Field" => "Kota Alanı",
 "Quota Default" => "Öntanımlı Kota",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index b7e4023dd73..4d187bab8d5 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 612a623e910..c9ed1e648a2 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -77,6 +77,7 @@ class Configuration {
 		'ldapExpertUUIDGroupAttr' => null,
 		'lastJpegPhotoLookup' => null,
 		'ldapNestedGroups' => false,
+		'ldapPagingSize' => null,
 	);
 
 	/**
@@ -119,9 +120,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;
@@ -344,6 +345,7 @@ class Configuration {
 			'has_memberof_filter_support'		=> 0,
 			'last_jpegPhoto_lookup'				=> 0,
 			'ldap_nested_groups'		        => 0,
+			'ldap_paging_size'					=> 500,
 		);
 	}
 
@@ -395,7 +397,8 @@ class Configuration {
 			'ldap_expert_uuid_group_attr'		=> 'ldapExpertUUIDGroupAttr',
 			'has_memberof_filter_support'		=> 'hasMemberOfFilterSupport',
 			'last_jpegPhoto_lookup'				=> 'lastJpegPhotoLookup',
-			'ldap_nested_groups'                    => 'ldapNestedGroups',
+			'ldap_nested_groups'                => 'ldapNestedGroups',
+			'ldap_paging_size'                  => 'ldapPagingSize',
 		);
 		return $array;
 	}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index b2075748a3b..08ac4ac626b 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/wizard.php b/apps/user_ldap/lib/wizard.php
index e79090febc1..3854af617c1 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -869,12 +869,14 @@ class Wizard extends LDAPUtility {
 	 * @param string $attr the attribute of which a list of values shall be returned
 	 * @param $lfw bool, whether the last filter is a wildcard which shall not
 	 * be processed if there were already findings, defaults to true
+	 * @param int $dnReadLimit the amount of how many DNs should be analyzed.
+	 * The lower, the faster
 	 * @param string $maxF string. if not null, this variable will have the filter that
 	 * yields most result entries
 	 * @return mixed, an array with the values on success, false otherwise
 	 *
 	 */
-	private function cumulativeSearchOnAttribute($filters, $attr, $lfw = true, &$maxF = null) {
+	public function cumulativeSearchOnAttribute($filters, $attr, $lfw = true, $dnReadLimit = 3, &$maxF = null) {
 		$dnRead = array();
 		$foundItems = array();
 		$maxEntries = 0;
@@ -884,11 +886,16 @@ class Wizard extends LDAPUtility {
 		}
 		$base = $this->configuration->ldapBase[0];
 		$cr = $this->getConnection();
-		if(!is_resource($cr)) {
+		if(!$this->ldap->isResource($cr)) {
 			return false;
 		}
+		$lastFilter = null;
+		if(isset($filters[count($filters)-1])) {
+			$lastFilter = $filters[count($filters)-1];
+		}
 		foreach($filters as $filter) {
-			if($lfw && count($foundItems) > 0) {
+			if($lfw && $lastFilter === $filter && count($foundItems) > 0) {
+				//skip when the filter is a wildcard and results were found
 				continue;
 			}
 			$rr = $this->ldap->search($cr, $base, $filter, array($attr));
@@ -902,8 +909,10 @@ class Wizard extends LDAPUtility {
 					$maxEntries = $entries;
 					$maxF = $filter;
 				}
+				$dnReadCount = 0;
 				do {
 					$entry = $this->ldap->$getEntryFunc($cr, $rr);
+					$getEntryFunc = 'nextEntry';
 					if(!$this->ldap->isResource($entry)) {
 						continue 2;
 					}
@@ -916,13 +925,14 @@ class Wizard extends LDAPUtility {
 					$state = $this->getAttributeValuesFromEntry($attributes,
 																$attr,
 																$newItems);
+					$dnReadCount++;
 					$foundItems = array_merge($foundItems, $newItems);
 					$this->resultCache[$dn][$attr] = $newItems;
 					$dnRead[] = $dn;
-					$getEntryFunc = 'nextEntry';
 					$rr = $entry; //will be expected by nextEntry next round
-				} while($state === self::LRESULT_PROCESSED_SKIP
-						|| $this->ldap->isResource($entry));
+				} while(($state === self::LRESULT_PROCESSED_SKIP
+						|| $this->ldap->isResource($entry))
+						&& ($dnReadLimit === 0 || $dnReadCount < $dnReadLimit));
 			}
 		}
 
@@ -950,9 +960,19 @@ class Wizard extends LDAPUtility {
 			$objectclasses[$key] = $p.$value;
 		}
 		$maxEntryObjC = '';
+
+		//how deep to dig?
+		//When looking for objectclasses, testing few entries is sufficient,
+		//when looking for group we need to get all names, though.
+		if(strtolower($attr) === 'objectclass') {
+			$dig = 3;
+		} else {
+			$dig = 0;
+		}
+
 		$availableFeatures =
 			$this->cumulativeSearchOnAttribute($objectclasses, $attr,
-											   true, $maxEntryObjC);
+											   true, $dig, $maxEntryObjC);
 		if(is_array($availableFeatures)
 		   && count($availableFeatures) > 0) {
 			natcasesort($availableFeatures);
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 79c4ae224c3..0a111225a70 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -1,5 +1,5 @@
 <form id="ldap" action="#" method="post">
-	<div id="ldapSettings" class="personalblock">
+	<div id="ldapSettings" class="section">
 	<ul>
 		<?php foreach($_['toc'] as $id => $title) { ?>
 			<li id="<?php p($id); ?>"><a href="<?php p($id); ?>"><?php p($title); ?></a></li>
@@ -23,7 +23,7 @@
 				<p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host'));?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.'));?>"></p>
 				<p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port'));?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>"  /></p>
 				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('Only connect to the replica server.'));?>" /></p>
-				<p><label for="ldap_nocase"><?php p($l->t('Case insensitve LDAP server (Windows)'));?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php p($_['ldap_nocase_default']); ?>"  value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) p(' checked'); ?>></p>
+				<p><label for="ldap_nocase"><?php p($l->t('Case insensitive LDAP server (Windows)'));?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php p($_['ldap_nocase_default']); ?>"  value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) p(' checked'); ?>></p>
 				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('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.', $theme->getName() ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
 				<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
 			</div>
@@ -37,6 +37,7 @@
 				<p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes'));?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes'));?>"></textarea></p>
 				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option></select></p>
 				<p><label for="ldap_nested_groups"><?php p($l->t('Nested Groups'));?></label><input type="checkbox" id="ldap_nested_groups" name="ldap_nested_groups" value="1" data-default="<?php p($_['ldap_nested_groups_default']); ?>"  title="<?php p($l->t('When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)'));?>" /></p>
+				<p><label for="ldap_paging_size"><?php p($l->t('Paging chunksize'));?></label><input type="number" id="ldap_paging_size" name="ldap_paging_size" title="<?php p($l->t('Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)'));?>" data-default="<?php p($_['ldap_paging_size']); ?>" /></p>
 			</div>
 			<h3><?php p($l->t('Special Attributes'));?></h3>
 			<div>
diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/connection.php
new file mode 100644
index 00000000000..f51b0c83017
--- /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/tests/wizard.php b/apps/user_ldap/tests/wizard.php
new file mode 100644
index 00000000000..2b5cabc705d
--- /dev/null
+++ b/apps/user_ldap/tests/wizard.php
@@ -0,0 +1,210 @@
+<?php
+/**
+* ownCloud
+*
+* @author Arthur Schiwon
+* @copyright 2014 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;
+
+use \OCA\user_ldap\lib\Wizard;
+
+// use \OCA\user_ldap\USER_LDAP as UserLDAP;
+// use \OCA\user_ldap\lib\Access;
+// use \OCA\user_ldap\lib\Configuration;
+// use \OCA\user_ldap\lib\ILDAPWrapper;
+
+class Test_Wizard extends \PHPUnit_Framework_TestCase {
+	public function setUp() {
+		//we need to make sure the consts are defined, otherwise tests will fail
+		//on systems without php5_ldap
+		$ldapConsts = array('LDAP_OPT_PROTOCOL_VERSION',
+							'LDAP_OPT_REFERRALS', 'LDAP_OPT_NETWORK_TIMEOUT');
+		foreach($ldapConsts as $const) {
+			if(!defined($const)) {
+				define($const, 42);
+			}
+		}
+	}
+
+	private function getWizardAndMocks() {
+		static $conMethods;
+
+		if(is_null($conMethods)) {
+			$conMethods = get_class_methods('\OCA\user_ldap\lib\Configuration');
+		}
+		$lw   = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+		$conf = $this->getMock('\OCA\user_ldap\lib\Configuration',
+							   $conMethods,
+							   array($lw, null, null));
+		return array(new Wizard($conf, $lw), $conf, $lw);
+	}
+
+	private function prepareLdapWrapperForConnections(&$ldap) {
+		$ldap->expects($this->once())
+			->method('connect')
+			//dummy value, usually invalid
+			->will($this->returnValue(true));
+
+		$ldap->expects($this->exactly(3))
+			->method('setOption')
+			->will($this->returnValue(true));
+
+		$ldap->expects($this->once())
+			->method('bind')
+			->will($this->returnValue(true));
+
+	}
+
+	public function testCumulativeSearchOnAttributeLimited() {
+		list($wizard, $configuration, $ldap) = $this->getWizardAndMocks();
+
+		$configuration->expects($this->any())
+			->method('__get')
+			->will($this->returnCallback(function($name) {
+					if($name === 'ldapBase') {
+						return array('base');
+					}
+					return null;
+			   }));
+
+		$this->prepareLdapWrapperForConnections($ldap);
+
+		$ldap->expects($this->any())
+			->method('isResource')
+			->will($this->returnValue(true));
+
+		$ldap->expects($this->exactly(2))
+			->method('search')
+			//dummy value, usually invalid
+			->will($this->returnValue(true));
+
+		$ldap->expects($this->exactly(2))
+			->method('countEntries')
+			//an is_resource check will follow, so we need to return a dummy resource
+			->will($this->returnValue(23));
+
+		//5 DNs per filter means 2x firstEntry and 8x nextEntry
+		$ldap->expects($this->exactly(2))
+			->method('firstEntry')
+			//dummy value, usually invalid
+			->will($this->returnValue(true));
+
+		$ldap->expects($this->exactly(8))
+			->method('nextEntry')
+			//dummy value, usually invalid
+			->will($this->returnValue(true));
+
+		$ldap->expects($this->exactly(10))
+			->method('getAttributes')
+			//dummy value, usually invalid
+			->will($this->returnValue(array('cn' => array('foo'), 'count' => 1)));
+
+		global $uidnumber;
+		$uidnumber = 1;
+		$ldap->expects($this->exactly(10))
+			->method('getDN')
+			//dummy value, usually invalid
+			->will($this->returnCallback(function($a, $b) {
+				global $uidnumber;
+				return $uidnumber++;
+			}));
+
+		# The following expectations are the real test #
+		$filters = array('f1', 'f2', '*');
+		$wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 5);
+		unset($uidnumber);
+	}
+
+	public function testCumulativeSearchOnAttributeUnlimited() {
+		list($wizard, $configuration, $ldap) = $this->getWizardAndMocks();
+
+		$configuration->expects($this->any())
+			->method('__get')
+			->will($this->returnCallback(function($name) {
+					if($name === 'ldapBase') {
+						return array('base');
+					}
+					return null;
+			   }));
+
+		$this->prepareLdapWrapperForConnections($ldap);
+
+		$ldap->expects($this->any())
+			->method('isResource')
+			->will($this->returnCallback(function($r) {
+				if($r === true) {
+					return true;
+				}
+				if($r % 24 === 0) {
+					global $uidnumber;
+					$uidnumber++;
+					return false;
+				}
+				return true;
+			}));
+
+		$ldap->expects($this->exactly(2))
+			->method('search')
+			//dummy value, usually invalid
+			->will($this->returnValue(true));
+
+		$ldap->expects($this->exactly(2))
+			->method('countEntries')
+			//an is_resource check will follow, so we need to return a dummy resource
+			->will($this->returnValue(23));
+
+		//5 DNs per filter means 2x firstEntry and 8x nextEntry
+		$ldap->expects($this->exactly(2))
+			->method('firstEntry')
+			//dummy value, usually invalid
+			->will($this->returnCallback(function($r) {
+				global $uidnumber;
+				return $uidnumber;
+			}));
+
+		$ldap->expects($this->exactly(46))
+			->method('nextEntry')
+			//dummy value, usually invalid
+			->will($this->returnCallback(function($r) {
+				global $uidnumber;
+				return $uidnumber;
+			}));
+
+		$ldap->expects($this->exactly(46))
+			->method('getAttributes')
+			//dummy value, usually invalid
+			->will($this->returnValue(array('cn' => array('foo'), 'count' => 1)));
+
+		global $uidnumber;
+		$uidnumber = 1;
+		$ldap->expects($this->exactly(46))
+			->method('getDN')
+			//dummy value, usually invalid
+			->will($this->returnCallback(function($a, $b) {
+				global $uidnumber;
+				return $uidnumber++;
+			}));
+
+		# The following expectations are the real test #
+		$filters = array('f1', 'f2', '*');
+		$wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 0);
+		unset($uidnumber);
+	}
+
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index 76b314e48aa..20c5909cc12 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/ast.php b/apps/user_webdavauth/l10n/ast.php
new file mode 100644
index 00000000000..118fa2ce30f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ast.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "Autenticación per aciu de WevDAV",
+"Address: " => "Direición:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les credenciales d'usuariu van unviase a esta direición. Esti complementu verifica la rempuesta y va interpretar los códigos de rempuesta HTTP 401 y 403 como credenciales inválides y toles otres rempuestes como credenciales válides."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index ad1701add8c..4596fdf3c78 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,9 +1,7 @@
-<form id="webdavauth" action="#" method="post">
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('WebDAV Authentication'));?></h2>
-		<p><label for="webdav_url"><?php p($l->t('Address: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
-		 <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
-		<input type="submit" value="Save" />
-		<br /><?php p($l->t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>
-	</fieldset>
+<form id="webdavauth" class="section" action="#" method="post">
+	<h2><?php p($l->t('WebDAV Authentication'));?></h2>
+	<p><label for="webdav_url"><?php p($l->t('Address: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
+	 <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
+	<input type="submit" value="Save" />
+	<br /><?php p($l->t('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.')); ?>
 </form>
diff --git a/autotest.sh b/autotest.sh
index b88e9cf68b4..4030fc0250e 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -139,7 +139,7 @@ function execute_tests {
 	cd $BASEDIR
 
 	# revert changes to tests/data
-	git checkout tests/data/*
+	git checkout tests/data
 
 	# reset data directory
 	rm -rf $DATADIR
diff --git a/build/package.json b/build/package.json
index c9ed7b96c6c..0c395839cf9 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 987a866e49b..adcc175e2fa 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -41,7 +41,7 @@ $CONFIG = array(
 /* The automatic protocol detection of ownCloud can fail in certain reverse proxy situations. This option allows to manually override the protocol detection. For example "https" */
 "overwriteprotocol" => "",
 
-/* The automatic webroot detection of ownCloud can fail in certain reverse proxy situations. This option allows to manually override the automatic detection. For example "/domain.tld/ownCloud" */
+/* The automatic webroot detection of ownCloud can fail in certain reverse proxy situations. This option allows to manually override the automatic detection. For example "/domain.tld/ownCloud". The value "/" can be used to remove the root. */
 "overwritewebroot" => "",
 
 /* The automatic detection of ownCloud can fail in certain reverse proxy situations. This option allows to define a manually override condition as regular expression for the remote ip address. For example "^10\.0\.0\.[1-3]$" */
@@ -178,6 +178,9 @@ $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,
 
@@ -273,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 25b8b312539..dd2c1026e47 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 3f04e1e4ad1..2b41bd8a5da 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();
 
@@ -206,6 +205,34 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				OC_JSON::success(array('data' => array('reshare' => $reshare, 'shares' => $shares)));
 			}
 			break;
+		case 'getShareWithEmail':
+			$result = array();
+			if (isset($_GET['search'])) {
+				$cm = OC::$server->getContactsManager();
+				if (!is_null($cm) && $cm->isEnabled()) {
+					$contacts = $cm->search($_GET['search'], array('FN', 'EMAIL'));
+					foreach ($contacts as $contact) {
+						if (!isset($contact['EMAIL'])) {
+							continue;
+						}
+
+						$emails = $contact['EMAIL'];
+						if (!is_array($emails)) {
+							$emails = array($emails);
+						}
+
+						foreach($emails as $email) {
+							$result[] = array(
+								'id' => $contact['id'],
+								'email' => $email,
+								'displayname' => $contact['FN'],
+							);
+						}
+					}
+				}
+			}
+			OC_JSON::success(array('data' => $result));
+			break;
 		case 'getShareWith':
 			if (isset($_GET['search'])) {
 				$sharePolicy = OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 2a0cbb2036d..55e8ab15ec2 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)) {
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index cfccfb5d2f0..ed72d136e24 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -34,9 +34,6 @@ class Upgrade extends Command {
 	 * @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';
 
diff --git a/core/command/user/report.php b/core/command/user/report.php
index 70c5a8566b7..a5159310af1 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 0e6a080c9cd..a8dfc5b7ed1 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -29,10 +29,14 @@
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
 #app-navigation .active,
-#app-navigation .active a,
-#app-navigation li:hover > a {
+#app-navigation .active a {
 	background-color: #ddd;
 }
+#app-navigation li:hover > a,
+#app-navigation .selected,
+#app-navigation .selected a {
+	background-color: #ccc;
+}
 
 /* special rules for first-level entries and folders */
 #app-navigation > ul > li {
@@ -151,9 +155,6 @@
 	transition: padding-bottom 500ms ease 0s;
 	padding-bottom: 40px;
 }
-#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
-	padding: 10px 0; margin: 0;
-}
 #app-navigation .error {
 	color: #dd1144;
 }
@@ -242,3 +243,24 @@ button.loading {
 	padding-right: 30px;
 }
 
+
+/* general styles for the content area */
+.section {
+	display: block;
+	padding: 30px;
+	color: #555;
+	border-top: 1px solid #ddd;
+}
+.section h2 {
+	font-size: 20px;
+	margin-bottom: 7px;
+}
+.section h3 {
+	font-size: 16px;
+}
+/* slight position correction of checkboxes and radio buttons */
+.section input[type="checkbox"],
+.section input[type="radio"] {
+	vertical-align: -2px;
+	margin-right: 4px;
+}
diff --git a/core/css/auth.css b/core/css/auth.css
deleted file mode 100644
index 70df9f0ae0f..00000000000
--- a/core/css/auth.css
+++ /dev/null
@@ -1,39 +0,0 @@
-h2 {
-	font-size:32px;
-	font-weight:700;
-	margin-bottom:16px;
-	white-space:nowrap;
-}
-
-ul.scopes {
-	list-style:disc;
-}
-
-ul.scopes li {
-	white-space:nowrap;
-}
-
-h2 img {
-	width:50%;
-}
-
-#oauth {
-	width:320px;
-	margin:64px auto 32px;
-}
-
-#allow-auth {
-	background-color:#5c3;
-	box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset;
-	color:#fff;
-	text-shadow:#5e3 0 1px 0;
-}
-
-#deny-auth {
-	background:none;
-	border:0;
-	box-shadow:0 0 0 #fff, 0 0 0 #fff inset;
-	font-size:19px;
-	margin:11px;
-	padding:0;
-}
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index 236968e3245..a1221137bc4 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 a63aa902d34..c67ac3e5ecf 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 69cf6df07d0..57e2c4479a1 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-color: #fff;
+	color: #333;
+	border: 1px solid #ddd;
+	outline: none;
 	border-radius: 3px;
 }
 input[type="hidden"] {
@@ -168,14 +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;
-	outline: none;
 }
 input[type="submit"]:hover, input[type="submit"]:focus,
 input[type="button"]:hover, input[type="button"]:focus,
@@ -246,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;
@@ -275,6 +283,10 @@ input[type="submit"].enabled {
 	padding: 7px 10px
 }
 
+#controls .button.hidden {
+	display: none;
+}
+
 #content { position:relative; height:100%; width:100%; }
 #content .hascontrols {
 	position: relative;
@@ -790,20 +802,12 @@ tr .action { width:16px; height:16px; }
 tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 tbody tr:hover, tr:active { background-color:#f8f8f8; }
 
-#body-settings h2 {
-	font-size: 20px;
-	font-weight: normal;
-	margin-bottom: 7px;
-}
-#body-settings .personalblock, #body-settings .helpblock {
-	padding: 30px;
-	color: #555;
-	border-top: 1px solid #ddd;
-}
-#body-settings .personalblock#quota { position:relative; padding:0; }
-#body-settings #controls+.helpblock { position:relative; margin-top:3em; }
 code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
 
+#quota {
+	position: relative;
+	padding: 0;
+}
 #quota div {
 	padding: 0;
 	background-color: rgb(220,220,220);
@@ -922,6 +926,9 @@ div.crumb {
 	background: url('../img/breadcrumb.svg') no-repeat right center;
 	height: 44px;
 }
+div.crumb.hidden {
+	display: none;
+}
 div.crumb a,
 div.crumb span {
 	position: relative;
diff --git a/core/js/compatibility.js b/core/js/compatibility.js
index 6548f95d42b..c07288857f2 100644
--- a/core/js/compatibility.js
+++ b/core/js/compatibility.js
@@ -148,3 +148,7 @@ function outerHTML(node){
 		return h;
 	})(node);
 }
+
+// devicePixelRatio for IE10
+window.devicePixelRatio = window.devicePixelRatio ||
+	window.screen.deviceXDPI / window.screen.logicalXDPI || 1;
diff --git a/core/js/core.json b/core/js/core.json
index 665e2485a90..05c2a17a679 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -6,7 +6,8 @@
 		"jquery-showpassword.js",
 		"jquery.infieldlabel.js",
 		"jquery.placeholder.js",
-		"jquery-tipsy.js"
+		"jquery-tipsy.js",
+		"underscore.js"
 	],
 	"modules": [
 		"compatibility.js",
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 381c42d9dbb..7c19cb321fe 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -77,7 +77,7 @@
 
 		var url = OC.generateUrl(
 			'/avatar/{user}/{size}?requesttoken={requesttoken}',
-			{user: user, size: size, requesttoken: oc_requesttoken});
+			{user: user, size: size * window.devicePixelRatio, requesttoken: oc_requesttoken});
 
 		$.get(url, function(result) {
 			if (typeof(result) === 'object') {
@@ -93,9 +93,9 @@
 			} else {
 				$div.show();
 				if (ie8fix === true) {
-					$div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
+					$div.html('<img width="' + size + '" height="' + size + '" src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
 				} else {
-					$div.html('<img src="'+url+'">');
+					$div.html('<img width="' + size + '" height="' + size + '" src="'+url+'">');
 				}
 			}
 			if(typeof callback === 'function') {
diff --git a/core/js/js.js b/core/js/js.js
index 841f3a769f1..f10c7163092 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 () { };
 	}
@@ -159,6 +159,7 @@ function escapeHTML(s) {
 * @param file The filename
 * @param dir The directory the file is in - e.g. $('#dir').val()
 * @return string
+* @deprecated use Files.getDownloadURL() instead
 */
 function fileDownloadPath(dir, file) {
 	return OC.filePath('files', 'ajax', 'download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
@@ -294,7 +295,7 @@ var OC={
 	 */
 	imagePath:function(app,file){
 		if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support
-			file+=(SVGSupport())?'.svg':'.png';
+			file+=(OC.Util.hasSVGSupport())?'.svg':'.png';
 		}
 		return OC.filePath(app,'img',file);
 	},
@@ -371,6 +372,7 @@ var OC={
 	 */
 	parseQueryString:function(queryString){
 		var parts,
+			pos,
 			components,
 			result = {},
 			key,
@@ -378,12 +380,25 @@ var OC={
 		if (!queryString){
 			return null;
 		}
-		if (queryString[0] === '?'){
-			queryString = queryString.substr(1);
+		pos = queryString.indexOf('?');
+		if (pos >= 0){
+			queryString = queryString.substr(pos + 1);
 		}
-		parts = queryString.split('&');
+		parts = queryString.replace(/\+/g, '%20').split('&');
 		for (var i = 0; i < parts.length; i++){
-			components = parts[i].split('=');
+			// split on first equal sign
+			var part = parts[i]
+			pos = part.indexOf('=');
+			if (pos >= 0) {
+				components = [
+					part.substr(0, pos),
+					part.substr(pos + 1)
+				]
+			}
+			else {
+				// key only
+				components = [part];
+			}
 			if (!components.length){
 				continue;
 			}
@@ -391,8 +406,14 @@ var OC={
 			if (!key){
 				continue;
 			}
-			value = components[1];
-			result[key] = value && decodeURIComponent(value);
+			// if equal sign was there, return string
+			if (components.length > 1) {
+				result[key] = decodeURIComponent(components[1]);
+			}
+			// no equal sign => null value
+			else {
+				result[key] = null;
+			}
 		}
 		return result;
 	},
@@ -476,12 +497,59 @@ var OC={
 							throw e;
 						});
 					}
-					if(!SVGSupport()) {
-						replaceSVG();
+					if(!OC.Util.hasSVGSupport()) {
+						OC.Util.replaceSVG();
 					}
 				}).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={};
@@ -712,12 +780,12 @@ 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'){
-				replaceSVG();
+			if(headers["content-type"]!=='image/svg+xml'){
+				OC.Util.replaceSVG();
 				SVGSupport.checkMimeType.correct=false;
 			}
 		}
@@ -725,35 +793,10 @@ SVGSupport.checkMimeType=function(){
 };
 SVGSupport.checkMimeType.correct=true;
 
-//replace all svg images with png for browser compatibility
-function replaceSVG(){
-	$('img.svg').each(function(index,element){
-		element=$(element);
-		var src=element.attr('src');
-		element.attr('src',src.substr(0,src.length-3)+'png');
-	});
-	$('.svg').each(function(index,element){
-		element=$(element);
-		var background=element.css('background-image');
-		if(background){
-			var i=background.lastIndexOf('.svg');
-			if(i>=0){
-				background=background.substr(0,i)+'.png'+background.substr(i+4);
-				element.css('background-image',background);
-			}
-		}
-		element.find('*').each(function(index,element) {
-			element=$(element);
-			var background=element.css('background-image');
-			if(background){
-				var i=background.lastIndexOf('.svg');
-				if(i>=0){
-					background=background.substr(0,i)+'.png'+background.substr(i+4);
-					element.css('background-image',background);
-				}
-			}
-		});
-	});
+// replace all svg images with png for browser compatibility
+// @deprecated use OC.Util.replaceSVG instead
+function replaceSVG($el){
+	return OC.Util.replaceSVG($el);
 }
 
 /**
@@ -831,8 +874,8 @@ function initCore() {
 		initSessionHeartBeat();
 	}
 
-	if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
-		replaceSVG();
+	if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that dont support svg
+		OC.Util.replaceSVG();
 	}else{
 		SVGSupport.checkMimeType();
 	}
@@ -940,6 +983,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);
@@ -1005,6 +1109,72 @@ function relative_modified_date(timestamp) {
 	else { return t('core','years ago'); }
 }
 
+OC.Util = {
+	/**
+	 * Returns whether the browser supports SVG
+	 *
+	 * @return true if the browser supports SVG, false otherwise
+	 */
+	// TODO: replace with original function
+	hasSVGSupport: SVGSupport,
+	/**
+	 * If SVG is not supported, replaces the given icon's extension
+	 * from ".svg" to ".png".
+	 * If SVG is supported, return the image path as is.
+	 *
+	 * @param file image path with svg extension
+	 * @return fixed image path with png extension if SVG is not
+	 * supported
+	 */
+	replaceSVGIcon: function(file) {
+		if (!OC.Util.hasSVGSupport()) {
+			var i = file.lastIndexOf('.svg');
+			if (i >= 0) {
+				file = file.substr(0, i) + '.png' + file.substr(i+4);
+			}
+		}
+		return file;
+	},
+	/**
+	 * Replace SVG images in all elements that have the "svg" class set
+	 * with PNG images.
+	 *
+	 * @param $el root element from which to search, defaults to $('body')
+	 */
+	replaceSVG: function($el) {
+		if (!$el) {
+			$el = $('body');
+		}
+		$el.find('img.svg').each(function(index,element){
+			element=$(element);
+			var src=element.attr('src');
+			element.attr('src',src.substr(0, src.length-3) + 'png');
+		});
+		$el.find('.svg').each(function(index,element){
+			element = $(element);
+			var background = element.css('background-image');
+			if (background){
+				var i = background.lastIndexOf('.svg');
+				if (i >= 0){
+					background = background.substr(0,i) + '.png' + background.substr(i + 4);
+					element.css('background-image', background);
+				}
+			}
+			element.find('*').each(function(index, element) {
+				element = $(element);
+				var background = element.css('background-image');
+				if (background) {
+					var i = background.lastIndexOf('.svg');
+					if(i >= 0){
+						background = background.substr(0,i) + '.png' + background.substr(i + 4);
+						element.css('background-image', background);
+					}
+				}
+			});
+		});
+	}
+};
+
 /**
  * get a variable by name
  * @param string name
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index d1bcb4659b8..2233b983ad4 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -19,6 +19,8 @@
  *
  */
 
+/* global OC, t */
+
 /**
  * this class to ease the usage of jquery dialogs
  */
@@ -138,6 +140,9 @@ var OCdialogs = {
 					self.$filePicker = null;
 				}
 			});
+			if (!OC.Util.hasSVGSupport()) {
+				OC.Util.replaceSVG(self.$filePicker.parent());
+			}
 		})
 		.fail(function(status, error) {
 			// If the method is called while navigating away
@@ -294,7 +299,7 @@ var OCdialogs = {
 				conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate));
 			}
 			var path = original.directory + '/' +original.name;
-			Files.lazyLoadPreview(path, original.mime, function(previewpath){
+			Files.lazyLoadPreview(path, original.mimetype, function(previewpath){
 				conflict.find('.original .icon').css('background-image','url('+previewpath+')');
 			}, 96, 96, original.etag);
 			getCroppedPreview(replacement).then(
@@ -343,7 +348,7 @@ var OCdialogs = {
 				addConflict(conflicts, original, replacement);
 
 				var count = $(dialog_id+ ' .conflict').length;
-				var title = n('files',
+				var title = n('core',
 								'{count} file conflict',
 								'{count} file conflicts',
 								count,
@@ -358,14 +363,17 @@ var OCdialogs = {
 				//create dialog
 				this._fileexistsshown = true;
 				$.when(this._getFileExistsTemplate()).then(function($tmpl) {
-					var title = t('files','One file conflict');
+					var title = t('core','One file conflict');
 					var $dlg = $tmpl.octemplate({
 						dialog_name: dialog_name,
 						title: title,
 						type: 'fileexists',
 
-						why: t('files','Which files do you want to keep?'),
-						what: t('files','If you select both versions, the copied file will have a number added to its name.')
+						allnewfiles: t('core','New Files'),
+						allexistingfiles: t('core','Already existing files'),
+
+						why: t('core','Which files do you want to keep?'),
+						what: t('core','If you select both versions, the copied file will have a number added to its name.')
 					});
 					$('body').append($dlg);
 
@@ -430,10 +438,10 @@ var OCdialogs = {
 						var count = $(dialog_id).find('.conflict .replacement input[type="checkbox"]:checked').length;
 						if (count === $(dialog_id+ ' .conflict').length) {
 							$(dialog_id).find('.allnewfiles').prop('checked', true);
-							$(dialog_id).find('.allnewfiles + .count').text(t('files','(all selected)'));
+							$(dialog_id).find('.allnewfiles + .count').text(t('core','(all selected)'));
 						} else if (count > 0) {
 							$(dialog_id).find('.allnewfiles').prop('checked', false);
-							$(dialog_id).find('.allnewfiles + .count').text(t('files','({count} selected)',{count:count}));
+							$(dialog_id).find('.allnewfiles + .count').text(t('core','({count} selected)',{count:count}));
 						} else {
 							$(dialog_id).find('.allnewfiles').prop('checked', false);
 							$(dialog_id).find('.allnewfiles + .count').text('');
@@ -443,10 +451,10 @@ var OCdialogs = {
 						var count = $(dialog_id).find('.conflict .original input[type="checkbox"]:checked').length;
 						if (count === $(dialog_id+ ' .conflict').length) {
 							$(dialog_id).find('.allexistingfiles').prop('checked', true);
-							$(dialog_id).find('.allexistingfiles + .count').text(t('files','(all selected)'));
+							$(dialog_id).find('.allexistingfiles + .count').text(t('core','(all selected)'));
 						} else if (count > 0) {
 							$(dialog_id).find('.allexistingfiles').prop('checked', false);
-							$(dialog_id).find('.allexistingfiles + .count').text(t('files','({count} selected)',{count:count}));
+							$(dialog_id).find('.allexistingfiles + .count').text(t('core','({count} selected)',{count:count}));
 						} else {
 							$(dialog_id).find('.allexistingfiles').prop('checked', false);
 							$(dialog_id).find('.allexistingfiles + .count').text('');
@@ -514,7 +522,7 @@ var OCdialogs = {
 		}
 
 		return $.getJSON(
-			OC.filePath('files', 'ajax', 'rawlist.php'),
+			OC.filePath('files', 'ajax', 'list.php'),
 			{
 				dir: dir,
 				mimetypes: JSON.stringify(mimeType)
@@ -539,7 +547,7 @@ var OCdialogs = {
 		this.$filelist.empty().addClass('loading');
 		this.$filePicker.data('path', dir);
 		$.when(this._getFileList(dir, this.$filePicker.data('mimetype'))).then(function(response) {
-			$.each(response.data, function(index, file) {
+			$.each(response.data.files, function(index, file) {
 				if (file.type === 'dir') {
 					dirs.push(file);
 				} else {
@@ -555,13 +563,25 @@ var OCdialogs = {
 					type: entry.type,
 					dir: dir,
 					filename: entry.name,
-					date: OC.mtime2date(entry.mtime)
+					date: OC.mtime2date(Math.floor(entry.mtime / 1000))
 				});
-				$li.find('img').attr('src', entry.mimetype_icon);
+				if (entry.isPreviewAvailable) {
+					var urlSpec = {
+						file: dir + '/' + entry.name
+					};
+					var previewUrl = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
+					$li.find('img').attr('src', previewUrl);
+				}
+				else {
+					$li.find('img').attr('src', OC.Util.replaceSVGIcon(entry.icon));
+				}
 				self.$filelist.append($li);
 			});
 
 			self.$filelist.removeClass('loading');
+			if (!OC.Util.hasSVGSupport()) {
+				OC.Util.replaceSVG(self.$filePicker.find('.dirtree'));
+			}
 		});
 	},
 	/**
diff --git a/core/js/share.js b/core/js/share.js
index 9ee50ff6963..5cabc614563 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);
 				}
 			}
 		}
@@ -331,6 +331,26 @@ OC.Share={
 					.append( insert )
 					.appendTo( ul );
 			};
+			$('#email').autocomplete({
+				minLength: 1,
+				source: function (search, response) {
+					$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWithEmail', search: search.term }, function(result) {
+						if (result.status == 'success' && result.data.length > 0) {
+							response(result.data);
+						}
+					});
+					},
+				select: function( event, item ) {
+					$('#email').val(item.item.email);
+					return false;
+				}
+			})
+			.data("ui-autocomplete")._renderItem = function( ul, item ) {
+				return $( "<li>" )
+					.append( "<a>" + item.displayname + "<br>" + item.email + "</a>" )
+					.appendTo( ul );
+			};
+
 		} else {
 			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Resharing is not allowed')+'" style="width:90%;" disabled="disabled"/>';
 			html += '</div>';
@@ -551,7 +571,7 @@ $(document).ready(function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		var shareType = $li.data('share-type');
-		var shareWith = $li.data('share-with');
+		var shareWith = $li.attr('data-share-with');
 		OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
 			$li.remove();
 			var index = OC.Share.itemShares[shareType].indexOf(shareWith);
@@ -597,7 +617,7 @@ $(document).ready(function() {
 		OC.Share.setPermissions($('#dropdown').data('item-type'),
 			$('#dropdown').data('item-source'),
 			li.data('share-type'),
-			li.data('share-with'),
+			li.attr('data-share-with'),
 			permissions);
 	});
 
@@ -782,7 +802,7 @@ $(document).ready(function() {
 		}
 
 		var shareType = $li.data('share-type');
-		var shareWith = $li.data('share-with');
+		var shareWith = $li.attr('data-share-with');
 
 		$.post(OC.filePath('core', 'ajax', 'share.php'), {action: action, recipient: shareWith, shareType: shareType, itemSource: itemSource, itemType: itemType}, function(result) {
 			if (result.status !== 'success') {
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 069546387c7..ccd9f7a1288 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -147,19 +147,19 @@ describe('Core base tests', function() {
 		});
 		describe('Images', function() {
 			it('Generates image path with given extension', function() {
-				var svgSupportStub = sinon.stub(window, 'SVGSupport', function() { return true; });
+				var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return true; });
 				expect(OC.imagePath('core', 'somefile.jpg')).toEqual(OC.webroot + '/core/img/somefile.jpg');
 				expect(OC.imagePath(TESTAPP, 'somefile.jpg')).toEqual(TESTAPP_ROOT + '/img/somefile.jpg');
 				svgSupportStub.restore();
 			});
 			it('Generates image path with svg extension when svg support exists', function() {
-				var svgSupportStub = sinon.stub(window, 'SVGSupport', function() { return true; });
+				var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return true; });
 				expect(OC.imagePath('core', 'somefile')).toEqual(OC.webroot + '/core/img/somefile.svg');
 				expect(OC.imagePath(TESTAPP, 'somefile')).toEqual(TESTAPP_ROOT + '/img/somefile.svg');
 				svgSupportStub.restore();
 			});
 			it('Generates image path with png ext when svg support is not available', function() {
-				var svgSupportStub = sinon.stub(window, 'SVGSupport', function() { return false; });
+				var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return false; });
 				expect(OC.imagePath('core', 'somefile')).toEqual(OC.webroot + '/core/img/somefile.png');
 				expect(OC.imagePath(TESTAPP, 'somefile')).toEqual(TESTAPP_ROOT + '/img/somefile.png');
 				svgSupportStub.restore();
@@ -268,7 +268,72 @@ describe('Core base tests', function() {
 			// still nothing
 			expect(counter).toEqual(0);
 		});
-
+	});
+	describe('Parse query string', function() {
+		it('Parses query string from full URL', function() {
+			var query = OC.parseQueryString('http://localhost/stuff.php?q=a&b=x');
+			expect(query).toEqual({q: 'a', b: 'x'});
+		});
+		it('Parses query string from query part alone', function() {
+			var query = OC.parseQueryString('q=a&b=x');
+			expect(query).toEqual({q: 'a', b: 'x'});
+		});
+		it('Returns null hash when empty query', function() {
+			var query = OC.parseQueryString('');
+			expect(query).toEqual(null);
+		});
+		it('Returns empty hash when empty query with question mark', function() {
+			var query = OC.parseQueryString('?');
+			expect(query).toEqual({});
+		});
+		it('Decodes regular query strings', function() {
+			var query = OC.parseQueryString('a=abc&b=def');
+			expect(query).toEqual({
+				a: 'abc',
+				b: 'def'
+			});
+		});
+		it('Ignores empty parts', function() {
+			var query = OC.parseQueryString('&q=a&&b=x&');
+			expect(query).toEqual({q: 'a', b: 'x'});
+		});
+		it('Ignores lone equal signs', function() {
+			var query = OC.parseQueryString('&q=a&=&b=x&');
+			expect(query).toEqual({q: 'a', b: 'x'});
+		});
+		it('Includes extra equal signs in value', function() {
+			var query = OC.parseQueryString('u=a=x&q=a=b');
+			expect(query).toEqual({u: 'a=x', q: 'a=b'});
+		});
+		it('Decodes plus as space', function() {
+			var query = OC.parseQueryString('space+key=space+value');
+			expect(query).toEqual({'space key': 'space value'});
+		});
+		it('Decodes special characters', function() {
+			var query = OC.parseQueryString('unicode=%E6%B1%89%E5%AD%97');
+			expect(query).toEqual({unicode: '汉字'});
+			query = OC.parseQueryString('b=spaace%20value&space%20key=normalvalue&slash%2Fthis=amp%26ersand');
+			expect(query).toEqual({
+				b: 'spaace value',
+				'space key': 'normalvalue',
+				'slash/this': 'amp&ersand'
+			});
+		});
+		it('Decodes empty values', function() {
+			var query = OC.parseQueryString('keywithemptystring=&keywithnostring');
+			expect(query).toEqual({
+				'keywithemptystring': '',
+				'keywithnostring': null
+			});
+		});
+		it('Does not interpret data types', function() {
+			var query = OC.parseQueryString('booleanfalse=false&booleantrue=true&number=123');
+			expect(query).toEqual({
+				'booleanfalse': 'false',
+				'booleantrue': 'true',
+				'number': '123'
+			});
+		});
 	});
 	describe('Generate Url', function() {
 		it('returns absolute urls', function() {
@@ -279,5 +344,135 @@ describe('Core base tests', 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);
+		});
+	});
+	describe('SVG extension replacement', function() {
+		var svgSupportStub;
+
+		beforeEach(function() {
+			svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport');
+		});
+		afterEach(function() {
+			svgSupportStub.restore();
+		});
+		it('does not replace svg extension with png when SVG is supported', function() {
+			svgSupportStub.returns(true);
+			expect(
+				OC.Util.replaceSVGIcon('/path/to/myicon.svg?someargs=1')
+			).toEqual(
+				'/path/to/myicon.svg?someargs=1'
+			);
+		});
+		it('replaces svg extension with png when SVG not supported', function() {
+			svgSupportStub.returns(false);
+			expect(
+				OC.Util.replaceSVGIcon('/path/to/myicon.svg?someargs=1')
+			).toEqual(
+				'/path/to/myicon.png?someargs=1'
+			);
+		});
+	});
 });
 
diff --git a/core/js/underscore.js b/core/js/underscore.js
new file mode 100644
index 00000000000..ca61fdc3a4b
--- /dev/null
+++ b/core/js/underscore.js
@@ -0,0 +1,1344 @@
+//     Underscore.js 1.6.0
+//     http://underscorejs.org
+//     (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Underscore may be freely distributed under the MIT license.
+
+(function() {
+
+  // Baseline setup
+  // --------------
+
+  // Establish the root object, `window` in the browser, or `exports` on the server.
+  var root = this;
+
+  // Save the previous value of the `_` variable.
+  var previousUnderscore = root._;
+
+  // Establish the object that gets returned to break out of a loop iteration.
+  var breaker = {};
+
+  // Save bytes in the minified (but not gzipped) version:
+  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+  // Create quick reference variables for speed access to core prototypes.
+  var
+    push             = ArrayProto.push,
+    slice            = ArrayProto.slice,
+    concat           = ArrayProto.concat,
+    toString         = ObjProto.toString,
+    hasOwnProperty   = ObjProto.hasOwnProperty;
+
+  // All **ECMAScript 5** native function implementations that we hope to use
+  // are declared here.
+  var
+    nativeForEach      = ArrayProto.forEach,
+    nativeMap          = ArrayProto.map,
+    nativeReduce       = ArrayProto.reduce,
+    nativeReduceRight  = ArrayProto.reduceRight,
+    nativeFilter       = ArrayProto.filter,
+    nativeEvery        = ArrayProto.every,
+    nativeSome         = ArrayProto.some,
+    nativeIndexOf      = ArrayProto.indexOf,
+    nativeLastIndexOf  = ArrayProto.lastIndexOf,
+    nativeIsArray      = Array.isArray,
+    nativeKeys         = Object.keys,
+    nativeBind         = FuncProto.bind;
+
+  // Create a safe reference to the Underscore object for use below.
+  var _ = function(obj) {
+    if (obj instanceof _) return obj;
+    if (!(this instanceof _)) return new _(obj);
+    this._wrapped = obj;
+  };
+
+  // Export the Underscore object for **Node.js**, with
+  // backwards-compatibility for the old `require()` API. If we're in
+  // the browser, add `_` as a global object via a string identifier,
+  // for Closure Compiler "advanced" mode.
+  if (typeof exports !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
+      exports = module.exports = _;
+    }
+    exports._ = _;
+  } else {
+    root._ = _;
+  }
+
+  // Current version.
+  _.VERSION = '1.6.0';
+
+  // Collection Functions
+  // --------------------
+
+  // The cornerstone, an `each` implementation, aka `forEach`.
+  // Handles objects with the built-in `forEach`, arrays, and raw objects.
+  // Delegates to **ECMAScript 5**'s native `forEach` if available.
+  var each = _.each = _.forEach = function(obj, iterator, context) {
+    if (obj == null) return obj;
+    if (nativeForEach && obj.forEach === nativeForEach) {
+      obj.forEach(iterator, context);
+    } else if (obj.length === +obj.length) {
+      for (var i = 0, length = obj.length; i < length; i++) {
+        if (iterator.call(context, obj[i], i, obj) === breaker) return;
+      }
+    } else {
+      var keys = _.keys(obj);
+      for (var i = 0, length = keys.length; i < length; i++) {
+        if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
+      }
+    }
+    return obj;
+  };
+
+  // Return the results of applying the iterator to each element.
+  // Delegates to **ECMAScript 5**'s native `map` if available.
+  _.map = _.collect = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
+    each(obj, function(value, index, list) {
+      results.push(iterator.call(context, value, index, list));
+    });
+    return results;
+  };
+
+  var reduceError = 'Reduce of empty array with no initial value';
+
+  // **Reduce** builds up a single result from a list of values, aka `inject`,
+  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
+  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduce && obj.reduce === nativeReduce) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
+    }
+    each(obj, function(value, index, list) {
+      if (!initial) {
+        memo = value;
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, value, index, list);
+      }
+    });
+    if (!initial) throw new TypeError(reduceError);
+    return memo;
+  };
+
+  // The right-associative version of reduce, also known as `foldr`.
+  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
+  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+    }
+    var length = obj.length;
+    if (length !== +length) {
+      var keys = _.keys(obj);
+      length = keys.length;
+    }
+    each(obj, function(value, index, list) {
+      index = keys ? keys[--length] : --length;
+      if (!initial) {
+        memo = obj[index];
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, obj[index], index, list);
+      }
+    });
+    if (!initial) throw new TypeError(reduceError);
+    return memo;
+  };
+
+  // Return the first value which passes a truth test. Aliased as `detect`.
+  _.find = _.detect = function(obj, predicate, context) {
+    var result;
+    any(obj, function(value, index, list) {
+      if (predicate.call(context, value, index, list)) {
+        result = value;
+        return true;
+      }
+    });
+    return result;
+  };
+
+  // Return all the elements that pass a truth test.
+  // Delegates to **ECMAScript 5**'s native `filter` if available.
+  // Aliased as `select`.
+  _.filter = _.select = function(obj, predicate, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(predicate, context);
+    each(obj, function(value, index, list) {
+      if (predicate.call(context, value, index, list)) results.push(value);
+    });
+    return results;
+  };
+
+  // Return all the elements for which a truth test fails.
+  _.reject = function(obj, predicate, context) {
+    return _.filter(obj, function(value, index, list) {
+      return !predicate.call(context, value, index, list);
+    }, context);
+  };
+
+  // Determine whether all of the elements match a truth test.
+  // Delegates to **ECMAScript 5**'s native `every` if available.
+  // Aliased as `all`.
+  _.every = _.all = function(obj, predicate, context) {
+    predicate || (predicate = _.identity);
+    var result = true;
+    if (obj == null) return result;
+    if (nativeEvery && obj.every === nativeEvery) return obj.every(predicate, context);
+    each(obj, function(value, index, list) {
+      if (!(result = result && predicate.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if at least one element in the object matches a truth test.
+  // Delegates to **ECMAScript 5**'s native `some` if available.
+  // Aliased as `any`.
+  var any = _.some = _.any = function(obj, predicate, context) {
+    predicate || (predicate = _.identity);
+    var result = false;
+    if (obj == null) return result;
+    if (nativeSome && obj.some === nativeSome) return obj.some(predicate, context);
+    each(obj, function(value, index, list) {
+      if (result || (result = predicate.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if the array or object contains a given value (using `===`).
+  // Aliased as `include`.
+  _.contains = _.include = function(obj, target) {
+    if (obj == null) return false;
+    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
+    return any(obj, function(value) {
+      return value === target;
+    });
+  };
+
+  // Invoke a method (with arguments) on every item in a collection.
+  _.invoke = function(obj, method) {
+    var args = slice.call(arguments, 2);
+    var isFunc = _.isFunction(method);
+    return _.map(obj, function(value) {
+      return (isFunc ? method : value[method]).apply(value, args);
+    });
+  };
+
+  // Convenience version of a common use case of `map`: fetching a property.
+  _.pluck = function(obj, key) {
+    return _.map(obj, _.property(key));
+  };
+
+  // Convenience version of a common use case of `filter`: selecting only objects
+  // containing specific `key:value` pairs.
+  _.where = function(obj, attrs) {
+    return _.filter(obj, _.matches(attrs));
+  };
+
+  // Convenience version of a common use case of `find`: getting the first object
+  // containing specific `key:value` pairs.
+  _.findWhere = function(obj, attrs) {
+    return _.find(obj, _.matches(attrs));
+  };
+
+  // Return the maximum element or (element-based computation).
+  // Can't optimize arrays of integers longer than 65,535 elements.
+  // See [WebKit Bug 80797](https://bugs.webkit.org/show_bug.cgi?id=80797)
+  _.max = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
+      return Math.max.apply(Math, obj);
+    }
+    var result = -Infinity, lastComputed = -Infinity;
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      if (computed > lastComputed) {
+        result = value;
+        lastComputed = computed;
+      }
+    });
+    return result;
+  };
+
+  // Return the minimum element (or element-based computation).
+  _.min = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
+      return Math.min.apply(Math, obj);
+    }
+    var result = Infinity, lastComputed = Infinity;
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      if (computed < lastComputed) {
+        result = value;
+        lastComputed = computed;
+      }
+    });
+    return result;
+  };
+
+  // Shuffle an array, using the modern version of the
+  // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
+  _.shuffle = function(obj) {
+    var rand;
+    var index = 0;
+    var shuffled = [];
+    each(obj, function(value) {
+      rand = _.random(index++);
+      shuffled[index - 1] = shuffled[rand];
+      shuffled[rand] = value;
+    });
+    return shuffled;
+  };
+
+  // Sample **n** random values from a collection.
+  // If **n** is not specified, returns a single random element.
+  // The internal `guard` argument allows it to work with `map`.
+  _.sample = function(obj, n, guard) {
+    if (n == null || guard) {
+      if (obj.length !== +obj.length) obj = _.values(obj);
+      return obj[_.random(obj.length - 1)];
+    }
+    return _.shuffle(obj).slice(0, Math.max(0, n));
+  };
+
+  // An internal function to generate lookup iterators.
+  var lookupIterator = function(value) {
+    if (value == null) return _.identity;
+    if (_.isFunction(value)) return value;
+    return _.property(value);
+  };
+
+  // Sort the object's values by a criterion produced by an iterator.
+  _.sortBy = function(obj, iterator, context) {
+    iterator = lookupIterator(iterator);
+    return _.pluck(_.map(obj, function(value, index, list) {
+      return {
+        value: value,
+        index: index,
+        criteria: iterator.call(context, value, index, list)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria;
+      var b = right.criteria;
+      if (a !== b) {
+        if (a > b || a === void 0) return 1;
+        if (a < b || b === void 0) return -1;
+      }
+      return left.index - right.index;
+    }), 'value');
+  };
+
+  // An internal function used for aggregate "group by" operations.
+  var group = function(behavior) {
+    return function(obj, iterator, context) {
+      var result = {};
+      iterator = lookupIterator(iterator);
+      each(obj, function(value, index) {
+        var key = iterator.call(context, value, index, obj);
+        behavior(result, key, value);
+      });
+      return result;
+    };
+  };
+
+  // Groups the object's values by a criterion. Pass either a string attribute
+  // to group by, or a function that returns the criterion.
+  _.groupBy = group(function(result, key, value) {
+    _.has(result, key) ? result[key].push(value) : result[key] = [value];
+  });
+
+  // Indexes the object's values by a criterion, similar to `groupBy`, but for
+  // when you know that your index values will be unique.
+  _.indexBy = group(function(result, key, value) {
+    result[key] = value;
+  });
+
+  // Counts instances of an object that group by a certain criterion. Pass
+  // either a string attribute to count by, or a function that returns the
+  // criterion.
+  _.countBy = group(function(result, key) {
+    _.has(result, key) ? result[key]++ : result[key] = 1;
+  });
+
+  // Use a comparator function to figure out the smallest index at which
+  // an object should be inserted so as to maintain order. Uses binary search.
+  _.sortedIndex = function(array, obj, iterator, context) {
+    iterator = lookupIterator(iterator);
+    var value = iterator.call(context, obj);
+    var low = 0, high = array.length;
+    while (low < high) {
+      var mid = (low + high) >>> 1;
+      iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid;
+    }
+    return low;
+  };
+
+  // Safely create a real, live array from anything iterable.
+  _.toArray = function(obj) {
+    if (!obj) return [];
+    if (_.isArray(obj)) return slice.call(obj);
+    if (obj.length === +obj.length) return _.map(obj, _.identity);
+    return _.values(obj);
+  };
+
+  // Return the number of elements in an object.
+  _.size = function(obj) {
+    if (obj == null) return 0;
+    return (obj.length === +obj.length) ? obj.length : _.keys(obj).length;
+  };
+
+  // Array Functions
+  // ---------------
+
+  // Get the first element of an array. Passing **n** will return the first N
+  // values in the array. Aliased as `head` and `take`. The **guard** check
+  // allows it to work with `_.map`.
+  _.first = _.head = _.take = function(array, n, guard) {
+    if (array == null) return void 0;
+    if ((n == null) || guard) return array[0];
+    if (n < 0) return [];
+    return slice.call(array, 0, n);
+  };
+
+  // Returns everything but the last entry of the array. Especially useful on
+  // the arguments object. Passing **n** will return all the values in
+  // the array, excluding the last N. The **guard** check allows it to work with
+  // `_.map`.
+  _.initial = function(array, n, guard) {
+    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
+  };
+
+  // Get the last element of an array. Passing **n** will return the last N
+  // values in the array. The **guard** check allows it to work with `_.map`.
+  _.last = function(array, n, guard) {
+    if (array == null) return void 0;
+    if ((n == null) || guard) return array[array.length - 1];
+    return slice.call(array, Math.max(array.length - n, 0));
+  };
+
+  // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
+  // Especially useful on the arguments object. Passing an **n** will return
+  // the rest N values in the array. The **guard**
+  // check allows it to work with `_.map`.
+  _.rest = _.tail = _.drop = function(array, n, guard) {
+    return slice.call(array, (n == null) || guard ? 1 : n);
+  };
+
+  // Trim out all falsy values from an array.
+  _.compact = function(array) {
+    return _.filter(array, _.identity);
+  };
+
+  // Internal implementation of a recursive `flatten` function.
+  var flatten = function(input, shallow, output) {
+    if (shallow && _.every(input, _.isArray)) {
+      return concat.apply(output, input);
+    }
+    each(input, function(value) {
+      if (_.isArray(value) || _.isArguments(value)) {
+        shallow ? push.apply(output, value) : flatten(value, shallow, output);
+      } else {
+        output.push(value);
+      }
+    });
+    return output;
+  };
+
+  // Flatten out an array, either recursively (by default), or just one level.
+  _.flatten = function(array, shallow) {
+    return flatten(array, shallow, []);
+  };
+
+  // Return a version of the array that does not contain the specified value(s).
+  _.without = function(array) {
+    return _.difference(array, slice.call(arguments, 1));
+  };
+
+  // Split an array into two arrays: one whose elements all satisfy the given
+  // predicate, and one whose elements all do not satisfy the predicate.
+  _.partition = function(array, predicate, context) {
+    predicate = lookupIterator(predicate);
+    var pass = [], fail = [];
+    each(array, function(elem) {
+      (predicate.call(context, elem) ? pass : fail).push(elem);
+    });
+    return [pass, fail];
+  };
+
+  // Produce a duplicate-free version of the array. If the array has already
+  // been sorted, you have the option of using a faster algorithm.
+  // Aliased as `unique`.
+  _.uniq = _.unique = function(array, isSorted, iterator, context) {
+    if (_.isFunction(isSorted)) {
+      context = iterator;
+      iterator = isSorted;
+      isSorted = false;
+    }
+    var initial = iterator ? _.map(array, iterator, context) : array;
+    var results = [];
+    var seen = [];
+    each(initial, function(value, index) {
+      if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) {
+        seen.push(value);
+        results.push(array[index]);
+      }
+    });
+    return results;
+  };
+
+  // Produce an array that contains the union: each distinct element from all of
+  // the passed-in arrays.
+  _.union = function() {
+    return _.uniq(_.flatten(arguments, true));
+  };
+
+  // Produce an array that contains every item shared between all the
+  // passed-in arrays.
+  _.intersection = function(array) {
+    var rest = slice.call(arguments, 1);
+    return _.filter(_.uniq(array), function(item) {
+      return _.every(rest, function(other) {
+        return _.contains(other, item);
+      });
+    });
+  };
+
+  // Take the difference between one array and a number of other arrays.
+  // Only the elements present in just the first array will remain.
+  _.difference = function(array) {
+    var rest = concat.apply(ArrayProto, slice.call(arguments, 1));
+    return _.filter(array, function(value){ return !_.contains(rest, value); });
+  };
+
+  // Zip together multiple lists into a single array -- elements that share
+  // an index go together.
+  _.zip = function() {
+    var length = _.max(_.pluck(arguments, 'length').concat(0));
+    var results = new Array(length);
+    for (var i = 0; i < length; i++) {
+      results[i] = _.pluck(arguments, '' + i);
+    }
+    return results;
+  };
+
+  // Converts lists into objects. Pass either a single array of `[key, value]`
+  // pairs, or two parallel arrays of the same length -- one of keys, and one of
+  // the corresponding values.
+  _.object = function(list, values) {
+    if (list == null) return {};
+    var result = {};
+    for (var i = 0, length = list.length; i < length; i++) {
+      if (values) {
+        result[list[i]] = values[i];
+      } else {
+        result[list[i][0]] = list[i][1];
+      }
+    }
+    return result;
+  };
+
+  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
+  // we need this function. Return the position of the first occurrence of an
+  // item in an array, or -1 if the item is not included in the array.
+  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
+  // If the array is large and already in sort order, pass `true`
+  // for **isSorted** to use binary search.
+  _.indexOf = function(array, item, isSorted) {
+    if (array == null) return -1;
+    var i = 0, length = array.length;
+    if (isSorted) {
+      if (typeof isSorted == 'number') {
+        i = (isSorted < 0 ? Math.max(0, length + isSorted) : isSorted);
+      } else {
+        i = _.sortedIndex(array, item);
+        return array[i] === item ? i : -1;
+      }
+    }
+    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
+    for (; i < length; i++) if (array[i] === item) return i;
+    return -1;
+  };
+
+  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
+  _.lastIndexOf = function(array, item, from) {
+    if (array == null) return -1;
+    var hasIndex = from != null;
+    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) {
+      return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item);
+    }
+    var i = (hasIndex ? from : array.length);
+    while (i--) if (array[i] === item) return i;
+    return -1;
+  };
+
+  // Generate an integer Array containing an arithmetic progression. A port of
+  // the native Python `range()` function. See
+  // [the Python documentation](http://docs.python.org/library/functions.html#range).
+  _.range = function(start, stop, step) {
+    if (arguments.length <= 1) {
+      stop = start || 0;
+      start = 0;
+    }
+    step = arguments[2] || 1;
+
+    var length = Math.max(Math.ceil((stop - start) / step), 0);
+    var idx = 0;
+    var range = new Array(length);
+
+    while(idx < length) {
+      range[idx++] = start;
+      start += step;
+    }
+
+    return range;
+  };
+
+  // Function (ahem) Functions
+  // ------------------
+
+  // Reusable constructor function for prototype setting.
+  var ctor = function(){};
+
+  // Create a function bound to a given object (assigning `this`, and arguments,
+  // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+  // available.
+  _.bind = function(func, context) {
+    var args, bound;
+    if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+    if (!_.isFunction(func)) throw new TypeError;
+    args = slice.call(arguments, 2);
+    return bound = function() {
+      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
+      ctor.prototype = func.prototype;
+      var self = new ctor;
+      ctor.prototype = null;
+      var result = func.apply(self, args.concat(slice.call(arguments)));
+      if (Object(result) === result) return result;
+      return self;
+    };
+  };
+
+  // Partially apply a function by creating a version that has had some of its
+  // arguments pre-filled, without changing its dynamic `this` context. _ acts
+  // as a placeholder, allowing any combination of arguments to be pre-filled.
+  _.partial = function(func) {
+    var boundArgs = slice.call(arguments, 1);
+    return function() {
+      var position = 0;
+      var args = boundArgs.slice();
+      for (var i = 0, length = args.length; i < length; i++) {
+        if (args[i] === _) args[i] = arguments[position++];
+      }
+      while (position < arguments.length) args.push(arguments[position++]);
+      return func.apply(this, args);
+    };
+  };
+
+  // Bind a number of an object's methods to that object. Remaining arguments
+  // are the method names to be bound. Useful for ensuring that all callbacks
+  // defined on an object belong to it.
+  _.bindAll = function(obj) {
+    var funcs = slice.call(arguments, 1);
+    if (funcs.length === 0) throw new Error('bindAll must be passed function names');
+    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
+    return obj;
+  };
+
+  // Memoize an expensive function by storing its results.
+  _.memoize = function(func, hasher) {
+    var memo = {};
+    hasher || (hasher = _.identity);
+    return function() {
+      var key = hasher.apply(this, arguments);
+      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
+    };
+  };
+
+  // Delays a function for the given number of milliseconds, and then calls
+  // it with the arguments supplied.
+  _.delay = function(func, wait) {
+    var args = slice.call(arguments, 2);
+    return setTimeout(function(){ return func.apply(null, args); }, wait);
+  };
+
+  // Defers a function, scheduling it to run after the current call stack has
+  // cleared.
+  _.defer = function(func) {
+    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
+  };
+
+  // Returns a function, that, when invoked, will only be triggered at most once
+  // during a given window of time. Normally, the throttled function will run
+  // as much as it can, without ever going more than once per `wait` duration;
+  // but if you'd like to disable the execution on the leading edge, pass
+  // `{leading: false}`. To disable execution on the trailing edge, ditto.
+  _.throttle = function(func, wait, options) {
+    var context, args, result;
+    var timeout = null;
+    var previous = 0;
+    options || (options = {});
+    var later = function() {
+      previous = options.leading === false ? 0 : _.now();
+      timeout = null;
+      result = func.apply(context, args);
+      context = args = null;
+    };
+    return function() {
+      var now = _.now();
+      if (!previous && options.leading === false) previous = now;
+      var remaining = wait - (now - previous);
+      context = this;
+      args = arguments;
+      if (remaining <= 0) {
+        clearTimeout(timeout);
+        timeout = null;
+        previous = now;
+        result = func.apply(context, args);
+        context = args = null;
+      } else if (!timeout && options.trailing !== false) {
+        timeout = setTimeout(later, remaining);
+      }
+      return result;
+    };
+  };
+
+  // Returns a function, that, as long as it continues to be invoked, will not
+  // be triggered. The function will be called after it stops being called for
+  // N milliseconds. If `immediate` is passed, trigger the function on the
+  // leading edge, instead of the trailing.
+  _.debounce = function(func, wait, immediate) {
+    var timeout, args, context, timestamp, result;
+
+    var later = function() {
+      var last = _.now() - timestamp;
+      if (last < wait) {
+        timeout = setTimeout(later, wait - last);
+      } else {
+        timeout = null;
+        if (!immediate) {
+          result = func.apply(context, args);
+          context = args = null;
+        }
+      }
+    };
+
+    return function() {
+      context = this;
+      args = arguments;
+      timestamp = _.now();
+      var callNow = immediate && !timeout;
+      if (!timeout) {
+        timeout = setTimeout(later, wait);
+      }
+      if (callNow) {
+        result = func.apply(context, args);
+        context = args = null;
+      }
+
+      return result;
+    };
+  };
+
+  // Returns a function that will be executed at most one time, no matter how
+  // often you call it. Useful for lazy initialization.
+  _.once = function(func) {
+    var ran = false, memo;
+    return function() {
+      if (ran) return memo;
+      ran = true;
+      memo = func.apply(this, arguments);
+      func = null;
+      return memo;
+    };
+  };
+
+  // Returns the first function passed as an argument to the second,
+  // allowing you to adjust arguments, run code before and after, and
+  // conditionally execute the original function.
+  _.wrap = function(func, wrapper) {
+    return _.partial(wrapper, func);
+  };
+
+  // Returns a function that is the composition of a list of functions, each
+  // consuming the return value of the function that follows.
+  _.compose = function() {
+    var funcs = arguments;
+    return function() {
+      var args = arguments;
+      for (var i = funcs.length - 1; i >= 0; i--) {
+        args = [funcs[i].apply(this, args)];
+      }
+      return args[0];
+    };
+  };
+
+  // Returns a function that will only be executed after being called N times.
+  _.after = function(times, func) {
+    return function() {
+      if (--times < 1) {
+        return func.apply(this, arguments);
+      }
+    };
+  };
+
+  // Object Functions
+  // ----------------
+
+  // Retrieve the names of an object's properties.
+  // Delegates to **ECMAScript 5**'s native `Object.keys`
+  _.keys = function(obj) {
+    if (!_.isObject(obj)) return [];
+    if (nativeKeys) return nativeKeys(obj);
+    var keys = [];
+    for (var key in obj) if (_.has(obj, key)) keys.push(key);
+    return keys;
+  };
+
+  // Retrieve the values of an object's properties.
+  _.values = function(obj) {
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var values = new Array(length);
+    for (var i = 0; i < length; i++) {
+      values[i] = obj[keys[i]];
+    }
+    return values;
+  };
+
+  // Convert an object into a list of `[key, value]` pairs.
+  _.pairs = function(obj) {
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var pairs = new Array(length);
+    for (var i = 0; i < length; i++) {
+      pairs[i] = [keys[i], obj[keys[i]]];
+    }
+    return pairs;
+  };
+
+  // Invert the keys and values of an object. The values must be serializable.
+  _.invert = function(obj) {
+    var result = {};
+    var keys = _.keys(obj);
+    for (var i = 0, length = keys.length; i < length; i++) {
+      result[obj[keys[i]]] = keys[i];
+    }
+    return result;
+  };
+
+  // Return a sorted list of the function names available on the object.
+  // Aliased as `methods`
+  _.functions = _.methods = function(obj) {
+    var names = [];
+    for (var key in obj) {
+      if (_.isFunction(obj[key])) names.push(key);
+    }
+    return names.sort();
+  };
+
+  // Extend a given object with all the properties in passed-in object(s).
+  _.extend = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      if (source) {
+        for (var prop in source) {
+          obj[prop] = source[prop];
+        }
+      }
+    });
+    return obj;
+  };
+
+  // Return a copy of the object only containing the whitelisted properties.
+  _.pick = function(obj) {
+    var copy = {};
+    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
+    each(keys, function(key) {
+      if (key in obj) copy[key] = obj[key];
+    });
+    return copy;
+  };
+
+   // Return a copy of the object without the blacklisted properties.
+  _.omit = function(obj) {
+    var copy = {};
+    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
+    for (var key in obj) {
+      if (!_.contains(keys, key)) copy[key] = obj[key];
+    }
+    return copy;
+  };
+
+  // Fill in a given object with default properties.
+  _.defaults = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      if (source) {
+        for (var prop in source) {
+          if (obj[prop] === void 0) obj[prop] = source[prop];
+        }
+      }
+    });
+    return obj;
+  };
+
+  // Create a (shallow-cloned) duplicate of an object.
+  _.clone = function(obj) {
+    if (!_.isObject(obj)) return obj;
+    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+  };
+
+  // Invokes interceptor with the obj, and then returns obj.
+  // The primary purpose of this method is to "tap into" a method chain, in
+  // order to perform operations on intermediate results within the chain.
+  _.tap = function(obj, interceptor) {
+    interceptor(obj);
+    return obj;
+  };
+
+  // Internal recursive comparison function for `isEqual`.
+  var eq = function(a, b, aStack, bStack) {
+    // Identical objects are equal. `0 === -0`, but they aren't identical.
+    // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
+    if (a === b) return a !== 0 || 1 / a == 1 / b;
+    // A strict comparison is necessary because `null == undefined`.
+    if (a == null || b == null) return a === b;
+    // Unwrap any wrapped objects.
+    if (a instanceof _) a = a._wrapped;
+    if (b instanceof _) b = b._wrapped;
+    // Compare `[[Class]]` names.
+    var className = toString.call(a);
+    if (className != toString.call(b)) return false;
+    switch (className) {
+      // Strings, numbers, dates, and booleans are compared by value.
+      case '[object String]':
+        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+        // equivalent to `new String("5")`.
+        return a == String(b);
+      case '[object Number]':
+        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
+        // other numeric values.
+        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
+      case '[object Date]':
+      case '[object Boolean]':
+        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+        // millisecond representations. Note that invalid dates with millisecond representations
+        // of `NaN` are not equivalent.
+        return +a == +b;
+      // RegExps are compared by their source patterns and flags.
+      case '[object RegExp]':
+        return a.source == b.source &&
+               a.global == b.global &&
+               a.multiline == b.multiline &&
+               a.ignoreCase == b.ignoreCase;
+    }
+    if (typeof a != 'object' || typeof b != 'object') return false;
+    // Assume equality for cyclic structures. The algorithm for detecting cyclic
+    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+    var length = aStack.length;
+    while (length--) {
+      // Linear search. Performance is inversely proportional to the number of
+      // unique nested structures.
+      if (aStack[length] == a) return bStack[length] == b;
+    }
+    // Objects with different constructors are not equivalent, but `Object`s
+    // from different frames are.
+    var aCtor = a.constructor, bCtor = b.constructor;
+    if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
+                             _.isFunction(bCtor) && (bCtor instanceof bCtor))
+                        && ('constructor' in a && 'constructor' in b)) {
+      return false;
+    }
+    // Add the first object to the stack of traversed objects.
+    aStack.push(a);
+    bStack.push(b);
+    var size = 0, result = true;
+    // Recursively compare objects and arrays.
+    if (className == '[object Array]') {
+      // Compare array lengths to determine if a deep comparison is necessary.
+      size = a.length;
+      result = size == b.length;
+      if (result) {
+        // Deep compare the contents, ignoring non-numeric properties.
+        while (size--) {
+          if (!(result = eq(a[size], b[size], aStack, bStack))) break;
+        }
+      }
+    } else {
+      // Deep compare objects.
+      for (var key in a) {
+        if (_.has(a, key)) {
+          // Count the expected number of properties.
+          size++;
+          // Deep compare each member.
+          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
+        }
+      }
+      // Ensure that both objects contain the same number of properties.
+      if (result) {
+        for (key in b) {
+          if (_.has(b, key) && !(size--)) break;
+        }
+        result = !size;
+      }
+    }
+    // Remove the first object from the stack of traversed objects.
+    aStack.pop();
+    bStack.pop();
+    return result;
+  };
+
+  // Perform a deep comparison to check if two objects are equal.
+  _.isEqual = function(a, b) {
+    return eq(a, b, [], []);
+  };
+
+  // Is a given array, string, or object empty?
+  // An "empty" object has no enumerable own-properties.
+  _.isEmpty = function(obj) {
+    if (obj == null) return true;
+    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
+    for (var key in obj) if (_.has(obj, key)) return false;
+    return true;
+  };
+
+  // Is a given value a DOM element?
+  _.isElement = function(obj) {
+    return !!(obj && obj.nodeType === 1);
+  };
+
+  // Is a given value an array?
+  // Delegates to ECMA5's native Array.isArray
+  _.isArray = nativeIsArray || function(obj) {
+    return toString.call(obj) == '[object Array]';
+  };
+
+  // Is a given variable an object?
+  _.isObject = function(obj) {
+    return obj === Object(obj);
+  };
+
+  // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp.
+  each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) {
+    _['is' + name] = function(obj) {
+      return toString.call(obj) == '[object ' + name + ']';
+    };
+  });
+
+  // Define a fallback version of the method in browsers (ahem, IE), where
+  // there isn't any inspectable "Arguments" type.
+  if (!_.isArguments(arguments)) {
+    _.isArguments = function(obj) {
+      return !!(obj && _.has(obj, 'callee'));
+    };
+  }
+
+  // Optimize `isFunction` if appropriate.
+  if (typeof (/./) !== 'function') {
+    _.isFunction = function(obj) {
+      return typeof obj === 'function';
+    };
+  }
+
+  // Is a given object a finite number?
+  _.isFinite = function(obj) {
+    return isFinite(obj) && !isNaN(parseFloat(obj));
+  };
+
+  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
+  _.isNaN = function(obj) {
+    return _.isNumber(obj) && obj != +obj;
+  };
+
+  // Is a given value a boolean?
+  _.isBoolean = function(obj) {
+    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
+  };
+
+  // Is a given value equal to null?
+  _.isNull = function(obj) {
+    return obj === null;
+  };
+
+  // Is a given variable undefined?
+  _.isUndefined = function(obj) {
+    return obj === void 0;
+  };
+
+  // Shortcut function for checking if an object has a given property directly
+  // on itself (in other words, not on a prototype).
+  _.has = function(obj, key) {
+    return hasOwnProperty.call(obj, key);
+  };
+
+  // Utility Functions
+  // -----------------
+
+  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+  // previous owner. Returns a reference to the Underscore object.
+  _.noConflict = function() {
+    root._ = previousUnderscore;
+    return this;
+  };
+
+  // Keep the identity function around for default iterators.
+  _.identity = function(value) {
+    return value;
+  };
+
+  _.constant = function(value) {
+    return function () {
+      return value;
+    };
+  };
+
+  _.property = function(key) {
+    return function(obj) {
+      return obj[key];
+    };
+  };
+
+  // Returns a predicate for checking whether an object has a given set of `key:value` pairs.
+  _.matches = function(attrs) {
+    return function(obj) {
+      if (obj === attrs) return true; //avoid comparing an object to itself.
+      for (var key in attrs) {
+        if (attrs[key] !== obj[key])
+          return false;
+      }
+      return true;
+    }
+  };
+
+  // Run a function **n** times.
+  _.times = function(n, iterator, context) {
+    var accum = Array(Math.max(0, n));
+    for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i);
+    return accum;
+  };
+
+  // Return a random integer between min and max (inclusive).
+  _.random = function(min, max) {
+    if (max == null) {
+      max = min;
+      min = 0;
+    }
+    return min + Math.floor(Math.random() * (max - min + 1));
+  };
+
+  // A (possibly faster) way to get the current timestamp as an integer.
+  _.now = Date.now || function() { return new Date().getTime(); };
+
+  // List of HTML entities for escaping.
+  var entityMap = {
+    escape: {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#x27;'
+    }
+  };
+  entityMap.unescape = _.invert(entityMap.escape);
+
+  // Regexes containing the keys and values listed immediately above.
+  var entityRegexes = {
+    escape:   new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'),
+    unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g')
+  };
+
+  // Functions for escaping and unescaping strings to/from HTML interpolation.
+  _.each(['escape', 'unescape'], function(method) {
+    _[method] = function(string) {
+      if (string == null) return '';
+      return ('' + string).replace(entityRegexes[method], function(match) {
+        return entityMap[method][match];
+      });
+    };
+  });
+
+  // If the value of the named `property` is a function then invoke it with the
+  // `object` as context; otherwise, return it.
+  _.result = function(object, property) {
+    if (object == null) return void 0;
+    var value = object[property];
+    return _.isFunction(value) ? value.call(object) : value;
+  };
+
+  // Add your own custom functions to the Underscore object.
+  _.mixin = function(obj) {
+    each(_.functions(obj), function(name) {
+      var func = _[name] = obj[name];
+      _.prototype[name] = function() {
+        var args = [this._wrapped];
+        push.apply(args, arguments);
+        return result.call(this, func.apply(_, args));
+      };
+    });
+  };
+
+  // Generate a unique integer id (unique within the entire client session).
+  // Useful for temporary DOM ids.
+  var idCounter = 0;
+  _.uniqueId = function(prefix) {
+    var id = ++idCounter + '';
+    return prefix ? prefix + id : id;
+  };
+
+  // By default, Underscore uses ERB-style template delimiters, change the
+  // following template settings to use alternative delimiters.
+  _.templateSettings = {
+    evaluate    : /<%([\s\S]+?)%>/g,
+    interpolate : /<%=([\s\S]+?)%>/g,
+    escape      : /<%-([\s\S]+?)%>/g
+  };
+
+  // When customizing `templateSettings`, if you don't want to define an
+  // interpolation, evaluation or escaping regex, we need one that is
+  // guaranteed not to match.
+  var noMatch = /(.)^/;
+
+  // Certain characters need to be escaped so that they can be put into a
+  // string literal.
+  var escapes = {
+    "'":      "'",
+    '\\':     '\\',
+    '\r':     'r',
+    '\n':     'n',
+    '\t':     't',
+    '\u2028': 'u2028',
+    '\u2029': 'u2029'
+  };
+
+  var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
+
+  // JavaScript micro-templating, similar to John Resig's implementation.
+  // Underscore templating handles arbitrary delimiters, preserves whitespace,
+  // and correctly escapes quotes within interpolated code.
+  _.template = function(text, data, settings) {
+    var render;
+    settings = _.defaults({}, settings, _.templateSettings);
+
+    // Combine delimiters into one regular expression via alternation.
+    var matcher = new RegExp([
+      (settings.escape || noMatch).source,
+      (settings.interpolate || noMatch).source,
+      (settings.evaluate || noMatch).source
+    ].join('|') + '|$', 'g');
+
+    // Compile the template source, escaping string literals appropriately.
+    var index = 0;
+    var source = "__p+='";
+    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+      source += text.slice(index, offset)
+        .replace(escaper, function(match) { return '\\' + escapes[match]; });
+
+      if (escape) {
+        source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+      }
+      if (interpolate) {
+        source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+      }
+      if (evaluate) {
+        source += "';\n" + evaluate + "\n__p+='";
+      }
+      index = offset + match.length;
+      return match;
+    });
+    source += "';\n";
+
+    // If a variable is not specified, place data values in local scope.
+    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+    source = "var __t,__p='',__j=Array.prototype.join," +
+      "print=function(){__p+=__j.call(arguments,'');};\n" +
+      source + "return __p;\n";
+
+    try {
+      render = new Function(settings.variable || 'obj', '_', source);
+    } catch (e) {
+      e.source = source;
+      throw e;
+    }
+
+    if (data) return render(data, _);
+    var template = function(data) {
+      return render.call(this, data, _);
+    };
+
+    // Provide the compiled function source as a convenience for precompilation.
+    template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
+
+    return template;
+  };
+
+  // Add a "chain" function, which will delegate to the wrapper.
+  _.chain = function(obj) {
+    return _(obj).chain();
+  };
+
+  // OOP
+  // ---------------
+  // If Underscore is called as a function, it returns a wrapped object that
+  // can be used OO-style. This wrapper holds altered versions of all the
+  // underscore functions. Wrapped objects may be chained.
+
+  // Helper function to continue chaining intermediate results.
+  var result = function(obj) {
+    return this._chain ? _(obj).chain() : obj;
+  };
+
+  // Add all of the Underscore functions to the wrapper object.
+  _.mixin(_);
+
+  // Add all mutator Array functions to the wrapper.
+  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      var obj = this._wrapped;
+      method.apply(obj, arguments);
+      if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0];
+      return result.call(this, obj);
+    };
+  });
+
+  // Add all accessor Array functions to the wrapper.
+  each(['concat', 'join', 'slice'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      return result.call(this, method.apply(this._wrapped, arguments));
+    };
+  });
+
+  _.extend(_.prototype, {
+
+    // Start chaining a wrapped Underscore object.
+    chain: function() {
+      this._chain = true;
+      return this;
+    },
+
+    // Extracts the result from a wrapped and chained object.
+    value: function() {
+      return this._wrapped;
+    }
+
+  });
+
+  // AMD registration happens at the end for compatibility with AMD loaders
+  // that may not enforce next-turn semantics on modules. Even though general
+  // practice for AMD registration is to be anonymous, underscore registers
+  // as a named module because, like jQuery, it is a base library that is
+  // popular enough to be bundled in a third party lib, but not be part of
+  // an AMD load request. Those cases could generate an error when an
+  // anonymous define() is called outside of a loader request.
+  if (typeof define === 'function' && define.amd) {
+    define('underscore', [], function() {
+      return _;
+    });
+  }
+}).call(this);
diff --git a/core/l10n/am_ET.php b/core/l10n/am_ET.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /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 8040e20d951..8c1d5ec3076 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" => "الاربعاء",
@@ -38,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" => "خطأ",
@@ -76,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" => "كلمات سر جديدة",
@@ -94,9 +102,11 @@ $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>",
 "Data folder" => "مجلد المعلومات",
 "Configure the database" => "أسس قاعدة البيانات",
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
new file mode 100644
index 00000000000..0fcda328dc0
--- /dev/null
+++ b/core/l10n/ast.php
@@ -0,0 +1,77 @@
+<?php
+$TRANSLATIONS = array(
+"Updated database" => "Base de datos anovada",
+"Invalid image" => "Imaxe inválida",
+"Sunday" => "Domingu",
+"Monday" => "Llunes",
+"Tuesday" => "Martes",
+"Wednesday" => "Miércoles",
+"Thursday" => "Xueves",
+"Friday" => "Vienres",
+"Saturday" => "Sábadu",
+"January" => "Xineru",
+"February" => "Febreru",
+"March" => "Marzu",
+"April" => "Abril",
+"May" => "Mayu",
+"June" => "Xunu",
+"July" => "Xunetu",
+"August" => "Agostu",
+"September" => "Setiembre",
+"October" => "Ochobre",
+"November" => "Payares",
+"December" => "Avientu",
+"Settings" => "Axustes",
+"seconds ago" => "fai segundos",
+"_%n minute ago_::_%n minutes ago_" => array("fai %n minutu","fai %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("fai %n hora","fai %n hores"),
+"today" => "güei",
+"yesterday" => "ayeri",
+"_%n day ago_::_%n days ago_" => array("fai %n día","fai %n díes"),
+"last month" => "mes caberu",
+"_%n month ago_::_%n months ago_" => array("fai %n mes","fai %n meses"),
+"months ago" => "fai meses",
+"last year" => "añu caberu",
+"years ago" => "fai años",
+"Choose" => "Esbillar",
+"Yes" => "Sí",
+"No" => "Non",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Which files do you want to keep?" => "¿Qué ficheros quies caltener?",
+"Cancel" => "Encaboxar",
+"Continue" => "Continuar",
+"Shared" => "Compartíu",
+"Share" => "Compartir",
+"Error" => "Fallu",
+"Share link" => "Compartir enllaz",
+"Password" => "Contraseña",
+"Send" => "Unviar",
+"group" => "grupu",
+"Unshare" => "Dexar de compartir",
+"notify by email" => "notificar per corréu",
+"can edit" => "pue editar",
+"access control" => "control d'accesu",
+"create" => "crear",
+"update" => "xubir",
+"delete" => "desaniciar",
+"share" => "compartir",
+"Password protected" => "Contraseña protexida",
+"Email sent" => "Corréu unviáu",
+"Delete" => "Desaniciar",
+"Add" => "Amestar",
+"Edit tags" => "Editar etiquetes",
+"Username" => "Nome d'usuariu",
+"Reset" => "Reaniciar",
+"For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
+"Personal" => "Personal",
+"Users" => "Usuarios",
+"Cheers!" => "¡Salú!",
+"will be used" => "usaráse",
+"Finishing …" => "Finando ...",
+"Log out" => "Zarrar sesión",
+"Lost your password?" => "¿Escaeciesti la to contraseña?",
+"Log in" => "Aniciar sesión",
+"Alternative Logins" => "Anicios de sesión alternativos",
+"Thank you for your patience." => "Gracies pola to paciencia."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/az.php b/core/l10n/az.php
index dbedde7e637..ffcdde48d47 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/bg_BG.php b/core/l10n/bg_BG.php
index 9178bb99cb2..397440bea2b 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -54,6 +54,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Дата на изтичане",
 "Share via email:" => "сподели по поща:",
 "No people found" => "Не са открити хора",
+"group" => "група",
 "Resharing is not allowed" => "Допълнително споделяне не е разрешено",
 "Shared in {item} with {user}" => "Споделено в {item} с {user}",
 "Unshare" => "Премахни споделяне",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 0e58f387a2f..214b2eac0e9 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicte de fitxer","{count} conflictes de fitxer"),
 "One file conflict" => "Un fitxer en conflicte",
+"New Files" => "Fitxers nous",
 "Which files do you want to keep?" => "Quin fitxer voleu conservar?",
 "If you select both versions, the copied file will have a number added to its name." => "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.",
 "Cancel" => "Cancel·la",
@@ -124,6 +123,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",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 498086b2805..c21d904b233 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"),
 "One file conflict" => "Jeden konflikt souboru",
+"New Files" => "Nové soubory",
 "Which files do you want to keep?" => "Které soubory chcete ponechat?",
 "If you select both versions, the copied file will have a number added to its name." => "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.",
 "Cancel" => "Zrušit",
@@ -111,6 +110,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ě?",
@@ -123,6 +123,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",
@@ -171,6 +173,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 <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/da.php b/core/l10n/da.php
index 09ab618282d..c7bda6fd365 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
@@ -52,6 +49,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Fejl ved indlæsning af besked skabelon: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
 "One file conflict" => "En filkonflikt",
+"New Files" => "Nye filer",
 "Which files do you want to keep?" => "Hvilke filer ønsker du at beholde?",
 "If you select both versions, the copied file will have a number added to its name." => "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.",
 "Cancel" => "Annuller",
@@ -59,6 +57,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 +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>." => "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,6 +147,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>",
+"Storage & database" => "Lager & database",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
 "will be used" => "vil blive brugt",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index b392dc1913c..fabf35440cb 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
 "One file conflict" => "Ein Dateikonflikt",
+"New Files" => "Neue Dateien",
+"Already existing files" => "Die Dateien existieren bereits",
 "Which files do you want to keep?" => "Welche Dateien möchtest Du behalten?",
 "If you select both versions, the copied file will have a number added to its name." => "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
 "Cancel" => "Abbrechen",
@@ -124,6 +124,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",
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index c83a092151c..eb2cfd233d3 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -3,8 +3,6 @@ $TRANSLATIONS = array(
 "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",
@@ -42,6 +40,7 @@ $TRANSLATIONS = array(
 "No" => "Nein",
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"New Files" => "Neue Dateien",
 "Cancel" => "Abbrechen",
 "Shared" => "Geteilt",
 "Share" => "Teilen",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 1c2f6e002dc..a65714f26f6 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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" => "Weder Bild noch ein Datei wurden zur Verfügung gestellt",
 "Unknown filetype" => "Unbekannter Dateityp",
 "Invalid image" => "Ungültiges Bild",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
 "One file conflict" => "Ein Dateikonflikt",
+"New Files" => "Neue Dateien",
+"Already existing files" => "Die Dateien existieren bereits",
 "Which files do you want to keep?" => "Welche Dateien möchten Sie behalten?",
 "If you select both versions, the copied file will have a number added to its name." => "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
 "Cancel" => "Abbrechen",
@@ -124,6 +124,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",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 61c21f1a847..c899427ae30 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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" => "Μη έγκυρη εικόνα",
@@ -52,14 +50,17 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"),
 "One file conflict" => "Ένα αρχείο διαφέρει",
+"New Files" => "Νέα Αρχεία",
 "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" => "Κοινόχρηστα",
@@ -122,6 +123,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" => "Εφαρμογές",
@@ -147,6 +150,7 @@ $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>",
+"Storage & database" => "Αποθήκευση & βάση δεδομένων",
 "Data folder" => "Φάκελος δεδομένων",
 "Configure the database" => "Ρύθμιση της βάσης δεδομένων",
 "will be used" => "θα χρησιμοποιηθούν",
@@ -169,6 +173,7 @@ $TRANSLATIONS = array(
 "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 μοιράστηκε το<strong>%s</strong> με εσάς.<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/en_GB.php b/core/l10n/en_GB.php
index f97f30dbd50..215bae92d1c 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Error loading message template: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"),
 "One file conflict" => "One file conflict",
+"New Files" => "New Files",
+"Already existing files" => "Already existing files",
 "Which files do you want to keep?" => "Which files do you wish to keep?",
 "If you select both versions, the copied file will have a number added to its name." => "If you select both versions, the copied file will have a number added to its name.",
 "Cancel" => "Cancel",
@@ -124,6 +124,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",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 86813ed9ce0..05d28efb66b 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,9 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Updated database" => "Ĝisdatiĝis datumbazo",
-"Updating filecache, this may take really long..." => "Ĝisdatigante la dosierkaŝmemoron, ĉi tio povas daŭri tro longe...",
-"Updated filecache" => "Ĝisdatiĝis dosierkaŝmemoro",
-"... %d%% done ..." => "... %d%% plenumiĝis ...",
 "Unknown filetype" => "Ne konatas dosiertipo",
 "Invalid image" => "Ne validas bildo",
 "Sunday" => "dimanĉo",
@@ -44,6 +41,7 @@ $TRANSLATIONS = array(
 "Ok" => "Akcepti",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
 "One file conflict" => "Unu dosierkonflikto",
+"New Files" => "Novaj dosieroj",
 "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",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index a8a3c6a631b..cb2d09d60fe 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
 "One file conflict" => "On conflicto de archivo",
+"New Files" => "Nuevos Archivos",
+"Already existing files" => "Archivos ya existentes",
 "Which files do you want to keep?" => "¿Que archivos deseas mantener?",
 "If you select both versions, the copied file will have a number added to its name." => "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.",
 "Cancel" => "Cancelar",
@@ -107,7 +107,7 @@ $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",
@@ -124,6 +124,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",
@@ -179,6 +181,6 @@ $TRANSLATIONS = array(
 "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 16b85eeb707..c9d270edefa 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
@@ -52,6 +49,7 @@ $TRANSLATIONS = 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",
+"New Files" => "Nuevos archivos",
 "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",
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index 960a39b8e63..6a90e3d7783 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index b48994e5d91..422caac9c15 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "Aegumise kuupäev on minevikus.",
 "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",
@@ -52,6 +50,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
 "One file conflict" => "Üks failikonflikt",
+"New Files" => "Uued failid",
 "Which files do you want to keep?" => "Milliseid faile sa soovid alles hoida?",
 "If you select both versions, the copied file will have a number added to its name." => "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.",
 "Cancel" => "Loobu",
@@ -59,6 +58,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(kõik valitud)",
 "({count} selected)" => "({count} valitud)",
 "Error loading file exists template" => "Viga faili olemasolu malli laadimisel",
+"Very weak password" => "Väga nõrk parool",
+"Weak password" => "Nõrk parool",
+"So-so password" => "Enam-vähem sobiv parool",
+"Good password" => "Hea parool",
+"Strong password" => "Väga hea parool",
 "Shared" => "Jagatud",
 "Share" => "Jaga",
 "Error" => "Viga",
@@ -106,6 +110,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>." => "Uuendus ebaõnnestus. Palun teavita probleemidest  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
 "%s password reset" => "%s parooli lähtestus",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Tekkis tõrge e-posti saatmisel, palun kontakteeru administraatoriga.",
 "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?",
@@ -118,6 +123,8 @@ $TRANSLATIONS = array(
 "To login page" => "Sisselogimise lehele",
 "New password" => "Uus parool",
 "Reset password" => "Nulli parool",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
+"For the best results, please consider using a GNU/Linux server instead." => "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
 "Personal" => "Isiklik",
 "Users" => "Kasutajad",
 "Apps" => "Rakendused",
@@ -143,6 +150,7 @@ $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>",
+"Storage & database" => "Andmehoidla ja andmebaas",
 "Data folder" => "Andmete kaust",
 "Configure the database" => "Seadista andmebaasi",
 "will be used" => "kasutatakse",
@@ -165,6 +173,7 @@ $TRANSLATIONS = array(
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
 "Alternative Logins" => "Alternatiivsed sisselogimisviisid",
+"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>annan teada, et %s jagas sinuga <strong>%s</strong>. <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 d0da3686e54..8fd554485db 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
@@ -52,6 +49,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Errorea mezu txantiloia kargatzean: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"),
 "One file conflict" => "Fitxategi batek konfliktua sortu du",
+"New Files" => "Fitxategi Berriak",
 "Which files do you want to keep?" => "Ze fitxategi mantendu nahi duzu?",
 "If you select both versions, the copied file will have a number added to its name." => "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio.",
 "Cancel" => "Ezeztatu",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 3e7e246e827..a349d3b7704 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -37,6 +37,7 @@ $TRANSLATIONS = array(
 "No" => "نه",
 "Ok" => "قبول",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
+"New Files" => "فایل های جدید",
 "Cancel" => "منصرف شدن",
 "Shared" => "اشتراک گذاشته شده",
 "Share" => "اشتراک‌گذاری",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 014a083cf96..7797d17c872 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
 "One file conflict" => "Yhden tiedoston ristiriita",
+"New Files" => "Uudet tiedostot",
+"Already existing files" => "Jo olemassa olevat tiedostot",
 "Which files do you want to keep?" => "Mitkä tiedostot haluat säilyttää?",
 "If you select both versions, the copied file will have a number added to its name." => "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.",
 "Cancel" => "Peru",
@@ -124,6 +124,8 @@ $TRANSLATIONS = array(
 "To login page" => "Kirjautumissivulle",
 "New password" => "Uusi salasana",
 "Reset password" => "Palauta salasana",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
+"For the best results, please consider using a GNU/Linux server instead." => "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
 "Personal" => "Henkilökohtainen",
 "Users" => "Käyttäjät",
 "Apps" => "Sovellukset",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 5206d746b4e..623f129c860 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "La date d'expiration est dans le passé.",
 "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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"),
 "One file conflict" => "Un conflit de fichier",
+"New Files" => "Nouveaux fichiers",
+"Already existing files" => "Fichiers déjà existants",
 "Which files do you want to keep?" => "Quels fichiers désirez-vous garder ?",
 "If you select both versions, the copied file will have a number added to its name." => "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
 "Cancel" => "Annuler",
@@ -124,6 +124,8 @@ $TRANSLATIONS = array(
 "To login page" => "Retour à la page d'authentification",
 "New password" => "Nouveau mot de passe",
 "Reset password" => "Réinitialiser le mot de passe",
+"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'est pas supporté et %s ne fonctionnera pas correctement sur cette plateforme. Son utilisation est à vos risques et périls !",
+"For the best results, please consider using a GNU/Linux server instead." => "Pour des résultats meilleurs encore, pensez à utiliser un serveur GNU/Linux à la place.",
 "Personal" => "Personnel",
 "Users" => "Utilisateurs",
 "Apps" => "Applications",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index c1130af9c53..eb9f1af5657 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"),
 "One file conflict" => "Un conflito de ficheiro",
+"New Files" => "Ficheiros novos",
+"Already existing files" => "Ficheiros xa existentes",
 "Which files do you want to keep?" => "Que ficheiros quere conservar?",
 "If you select both versions, the copied file will have a number added to its name." => "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
 "Cancel" => "Cancelar",
@@ -124,6 +124,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",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 4579626f12d..8fb7373a143 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -37,6 +37,7 @@ $TRANSLATIONS = array(
 "No" => "לא",
 "Ok" => "בסדר",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"New Files" => "קבצים חדשים",
 "Cancel" => "ביטול",
 "Shared" => "שותף",
 "Share" => "שתף",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 5e4d13335c8..096b28e2d9b 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
@@ -52,6 +49,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
 "One file conflict" => "Egy file ütközik",
+"New Files" => "Új fájlok",
 "Which files do you want to keep?" => "Melyik file-okat akarod megtartani?",
 "If you select both versions, the copied file will have a number added to its name." => "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz.",
 "Cancel" => "Mégsem",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 88861e605c0..5038d0d6c82 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index ad473521bbf..98d0d5e3b0e 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"),
 "One file conflict" => "Un file in conflitto",
+"New Files" => "File nuovi",
+"Already existing files" => "File già esistenti",
 "Which files do you want to keep?" => "Quali file vuoi mantenere?",
 "If you select both versions, the copied file will have a number added to its name." => "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato.",
 "Cancel" => "Annulla",
@@ -124,6 +124,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",
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index 9fce579e692..3a99f0e598b 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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" => "無効な画像",
@@ -52,6 +50,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
 "One file conflict" => "1ファイルが競合",
+"New Files" => "新しいファイル",
 "Which files do you want to keep?" => "どちらのファイルを保持したいですか？",
 "If you select both versions, the copied file will have a number added to its name." => "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。",
 "Cancel" => "キャンセル",
@@ -124,6 +123,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 では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
+"For the best results, please consider using a GNU/Linux server instead." => "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
 "Personal" => "個人",
 "Users" => "ユーザー",
 "Apps" => "アプリ",
diff --git a/core/l10n/jv.php b/core/l10n/jv.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/jv.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/ka_GE.php b/core/l10n/ka_GE.php
index 0070fd7994e..a76a8866541 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -37,6 +37,7 @@ $TRANSLATIONS = array(
 "No" => "არა",
 "Ok" => "დიახ",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
+"New Files" => "ახალი ფაილები",
 "Cancel" => "უარყოფა",
 "Shared" => "გაზიარებული",
 "Share" => "გაზიარება",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 7f739934f22..6020777f874 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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" => "잘못된 이미지",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index e1eaf3b7d65..b60f6c7c5f5 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -3,9 +3,6 @@ $TRANSLATIONS = array(
 "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",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index c027e54227d..776cde74fe7 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 505bf46b4c9..683ff2c129a 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -37,6 +37,7 @@ $TRANSLATIONS = array(
 "No" => "Nē",
 "Ok" => "Labi",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"New Files" => "Jaunās datnes",
 "Cancel" => "Atcelt",
 "Shared" => "Kopīgs",
 "Share" => "Dalīties",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 9bba50df46d..c56ae32bf2a 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" => "Невалидна фотографија",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 723d92c0433..c47599f5a17 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "Turned on maintenance mode" => "Slo på vedlikeholdsmodus",
 "Turned off maintenance mode" => "Slo av vedlikeholdsmodus",
 "Updated database" => "Oppdaterte databasen",
-"Updating filecache, this may take really long..." => "Oppdaterer fil-cache. Dette kan ta veldig lang tid...",
-"Updated filecache" => "Oppdaterte fil-cache",
-"... %d%% done ..." => "... %d%% ferdig ...",
 "No image or file provided" => "Bilde eller fil ikke angitt",
 "Unknown filetype" => "Ukjent filtype",
 "Invalid image" => "Ugyldig bilde",
@@ -59,6 +56,10 @@ $TRANSLATIONS = array(
 "(all selected)" => "(alle valgt)",
 "({count} selected)" => "({count} valgt)",
 "Error loading file exists template" => "Feil ved lasting av \"filen eksisterer\"-mal",
+"Very weak password" => "Veldig svakt passord",
+"Weak password" => "Svakt passord",
+"Good password" => "Bra passord",
+"Strong password" => "Sterkt passord",
 "Shared" => "Delt",
 "Share" => "Del",
 "Error" => "Feil",
@@ -143,6 +144,7 @@ $TRANSLATIONS = array(
 "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>",
+"Storage & database" => "Lagring og database",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
 "will be used" => "vil bli brukt",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 4610674ed46..b09509e6290 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
 "One file conflict" => "Een bestandsconflict",
+"New Files" => "Nieuwe bestanden",
+"Already existing files" => "Al aanwezige bestanden",
 "Which files do you want to keep?" => "Welke bestanden wilt u bewaren?",
 "If you select both versions, the copied file will have a number added to its name." => "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen.",
 "Cancel" => "Annuleer",
@@ -124,6 +124,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",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 03f0a979c7e..e6a80262a23 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -3,9 +3,6 @@ $TRANSLATIONS = array(
 "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",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index bb73665a6bf..fe0cf145832 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Błąd podczas ładowania szablonu wiadomości: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
 "One file conflict" => "Konflikt pliku",
+"New Files" => "Nowe pliki",
+"Already existing files" => "Już istniejące pliki",
 "Which files do you want to keep?" => "Które pliki chcesz zachować?",
 "If you select both versions, the copied file will have a number added to its name." => "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie",
 "Cancel" => "Anuluj",
@@ -124,6 +124,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",
diff --git a/core/l10n/pl_PL.php b/core/l10n/pl_PL.php
deleted file mode 100644
index 15c376eb954..00000000000
--- a/core/l10n/pl_PL.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "Ustawienia",
-"Username" => "Nazwa użytkownika"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 0d1ed5efa13..3545426b670 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de arquivo","{count} conflitos de arquivos"),
 "One file conflict" => "Conflito em um arquivo",
+"New Files" => "Novos Arquivos",
+"Already existing files" => "Arquivos já existentes",
 "Which files do you want to keep?" => "Qual arquivo você quer manter?",
 "If you select both versions, the copied file will have a number added to its name." => "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
 "Cancel" => "Cancelar",
@@ -124,6 +124,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",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index b94500604b6..bb1b6011a6b 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
@@ -52,6 +49,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Erro ao carregar o template: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de ficheiro","{count} conflitos de ficheiro"),
 "One file conflict" => "Um conflito no ficheiro",
+"New Files" => "Ficheiros Novos",
 "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",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 0fe0c881e66..aa784088f7a 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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" => "Изображение повреждено",
@@ -52,6 +50,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Ошибка загрузки шаблона сообщений: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
 "One file conflict" => "Один конфликт в файлах",
+"New Files" => "Новые файлы",
 "Which files do you want to keep?" => "Какие файлы вы хотите сохранить?",
 "If you select both versions, the copied file will have a number added to its name." => "При выборе обоих версий,  к названию копируемого файла будет добавлена цифра",
 "Cancel" => "Отменить",
@@ -59,6 +58,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 +110,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 +123,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,6 +150,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>",
+"Storage & database" => "Система хранения данных & база данных",
 "Data folder" => "Директория с данными",
 "Configure the database" => "Настройка базы данных",
 "will be used" => "будет использовано",
@@ -165,6 +173,7 @@ $TRANSLATIONS = array(
 "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." => "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 7d1e857bc2c..1b717bc412e 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "   \t\nDátum expirácie spadá do minulosti.",
 "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",
@@ -52,6 +50,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Chyba pri nahrávaní šablóny správy: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"),
 "One file conflict" => "Jeden konflikt súboru",
+"New Files" => "Nové súbory",
 "Which files do you want to keep?" => "Ktoré súbory chcete ponechať?",
 "If you select both versions, the copied file will have a number added to its name." => "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
 "Cancel" => "Zrušiť",
@@ -59,6 +58,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(všetko vybrané)",
 "({count} selected)" => "({count} vybraných)",
 "Error loading file exists template" => "Chyba pri nahrávaní šablóny existencie súboru",
+"Very weak password" => "Veľmi slabé heslo",
+"Weak password" => "Slabé heslo",
+"So-so password" => "Priemerné heslo",
+"Good password" => "Dobré heslo",
+"Strong password" => "Silné heslo",
 "Shared" => "Zdieľané",
 "Share" => "Zdieľať",
 "Error" => "Chyba",
@@ -106,6 +110,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>." => "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",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Vyskytol sa problém pri odosielaní emailu, prosím obráťte sa na správcu.",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenie hesla bol odoslaný na vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že vaše používateľské meno a email sú správne?",
@@ -118,6 +123,8 @@ $TRANSLATIONS = array(
 "To login page" => "Na prihlasovaciu stránku",
 "New password" => "Nové heslo",
 "Reset password" => "Obnovenie hesla",
+"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 je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
+"For the best results, please consider using a GNU/Linux server instead." => "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
 "Personal" => "Osobné",
 "Users" => "Používatelia",
 "Apps" => "Aplikácie",
@@ -132,7 +139,7 @@ $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 s tebou zdieľa %s.\nTu je odkaz: %s\n\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
 "The share will expire on %s." => "Zdieľanie expiruje %s.",
 "Cheers!" => "Pekný deň!",
 "Security Warning" => "Bezpečnostné varovanie",
@@ -143,6 +150,7 @@ $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>",
+"Storage & database" => "Úložislo & databáza",
 "Data folder" => "Priečinok dát",
 "Configure the database" => "Nastaviť databázu",
 "will be used" => "bude použité",
@@ -165,6 +173,7 @@ $TRANSLATIONS = array(
 "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 <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</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 cadf11532cb..7476d9f9c7c 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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",
@@ -52,6 +50,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Napaka nalaganja predloge sporočil: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
 "One file conflict" => "En spor datotek",
+"New Files" => "Nove datoteke",
 "Which files do you want to keep?" => "Katare datoteke želite ohraniti?",
 "If you select both versions, the copied file will have a number added to its name." => "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
 "Cancel" => "Prekliči",
@@ -124,6 +123,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",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 0f414a5158a..bfb7b0903f6 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -3,9 +3,6 @@ $TRANSLATIONS = array(
 "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ë",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index bd282bad66c..d46c204d7c3 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "Utgångsdatumet är i det förflutna.",
 "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",
@@ -52,6 +50,8 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Fel uppstod under inläsningen av meddelandemallen: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
 "One file conflict" => "En filkonflikt",
+"New Files" => "Nya filer",
+"Already existing files" => "Filer som redan existerar",
 "Which files do you want to keep?" => "Vilken fil vill du behålla?",
 "If you select both versions, the copied file will have a number added to its name." => "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
 "Cancel" => "Avbryt",
@@ -59,6 +59,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(Alla valda)",
 "({count} selected)" => "({count} valda)",
 "Error loading file exists template" => "Fel uppstod filmall existerar",
+"Very weak password" => "Väldigt svagt lösenord",
+"Weak password" => "Svagt lösenord",
+"So-so password" => "Okej lösenord",
+"Good password" => "Bra lösenord",
+"Strong password" => "Starkt lösenord",
 "Shared" => "Delad",
 "Share" => "Dela",
 "Error" => "Fel",
@@ -102,9 +107,11 @@ $TRANSLATIONS = array(
 "Edit tags" => "Editera taggar",
 "Error loading dialog template: {error}" => "Fel under laddning utav dialog mall: {fel}",
 "No tags selected for deletion." => "Inga taggar valda för borttagning.",
+"Please reload the page." => "Vänligen ladda om sidan.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
 "%s password reset" => "%s återställ lösenord",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Ett problem har uppstått under tiden e-post sändes, vänligen kontakta din administratör.",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Länken för att återställa ditt lösenorden har skickats till din e-postadress<br>Om du inte har erhållit meddelandet inom kort, vänligen kontrollera din skräppost-mapp<br>Om den inte finns där, vänligen kontakta din administratör.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/användarnamn är korrekt?",
@@ -117,6 +124,8 @@ $TRANSLATIONS = array(
 "To login page" => "Till logginsidan",
 "New password" => "Nytt lösenord",
 "Reset password" => "Återställ lösenordet",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
+"For the best results, please consider using a GNU/Linux server instead." => "För bästa resultat, överväg att använda en GNU/Linux server istället.",
 "Personal" => "Personligt",
 "Users" => "Användare",
 "Apps" => "Program",
@@ -142,6 +151,7 @@ $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>",
+"Storage & database" => "Lagring & databas",
 "Data folder" => "Datamapp",
 "Configure the database" => "Konfigurera databasen",
 "will be used" => "kommer att användas",
@@ -152,6 +162,7 @@ $TRANSLATIONS = array(
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
 "Finishing …" => "Avslutar ...",
+"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." => "Denna applikation kräver JavaScript aktiverat för att fungera korrekt. Vänligen <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivera JavaScript</a> och ladda om gränssnittet.",
 "%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
 "Log out" => "Logga ut",
 "Automatic logon rejected!" => "Automatisk inloggning inte tillåten!",
@@ -163,6 +174,9 @@ $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 <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "Denna ownCloud instans är för närvarande i enanvändarläge",
+"This means only administrators can use the instance." => "Detta betyder att endast administartörer kan använda instansen.",
 "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/th_TH.php b/core/l10n/th_TH.php
index 85a9b4ab238..9ee3c60f947 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -37,6 +37,7 @@ $TRANSLATIONS = array(
 "No" => "ไม่ตกลง",
 "Ok" => "ตกลง",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
+"New Files" => "ไฟล์ใหม่",
 "Cancel" => "ยกเลิก",
 "Shared" => "แชร์แล้ว",
 "Share" => "แชร์",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 3c00a5aaeae..8f9c60c157b 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"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,7 +31,7 @@ $TRANSLATIONS = array(
 "December" => "Aralık",
 "Settings" => "Ayarlar",
 "Saving..." => "Kaydediliyor...",
-"seconds ago" => "saniye önce",
+"seconds ago" => "saniyeler ö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"),
 "today" => "bugün",
@@ -44,7 +42,7 @@ $TRANSLATIONS = array(
 "months ago" => "ay önce",
 "last year" => "geçen yıl",
 "years ago" => "yıl önce",
-"Choose" => "seç",
+"Choose" => "Seç",
 "Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
 "Yes" => "Evet",
 "No" => "Hayır",
@@ -52,8 +50,10 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "İleti şablonu yüklenirken hata: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} dosya çakışması","{count} dosya çakışması"),
 "One file conflict" => "Bir dosya çakışması",
+"New Files" => "Yeni Dosyalar",
+"Already existing files" => "Zaten mevcut olan dosyalar",
 "Which files do you want to keep?" => "Hangi dosyaları saklamak istiyorsunuz?",
-"If you select both versions, the copied file will have a number added to its name." => "Eğer iki sürümü de seçerseniz, kopyalanan dosya ismine eklenmiş bir sayı içerecektir.",
+"If you select both versions, the copied file will have a number added to its name." => "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir.",
 "Cancel" => "İptal",
 "Continue" => "Devam et",
 "(all selected)" => "(tümü seçildi)",
@@ -67,7 +67,7 @@ $TRANSLATIONS = array(
 "Shared" => "Paylaşılan",
 "Share" => "Paylaş",
 "Error" => "Hata",
-"Error while sharing" => "Paylaşım sırasında hata  ",
+"Error while sharing" => "Paylaşım sırasında hata",
 "Error while unsharing" => "Paylaşım iptal edilirken hata",
 "Error while changing permissions" => "İzinleri değiştirirken hata oluştu",
 "Shared with you and the group {group} by {owner}" => "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
@@ -113,7 +113,7 @@ $TRANSLATIONS = array(
 "%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ı",
@@ -124,6 +124,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",
@@ -159,7 +161,7 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Veritabanı tablo alanı",
 "Database host" => "Veritabanı sunucusu",
 "Finish setup" => "Kurulumu tamamla",
-"Finishing …" => "Tamamlanıyor ..",
+"Finishing …" => "Tamamlanıyor ...",
 "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." => "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesini gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve bu arayüzü yeniden yükleyin.",
 "%s is available. Get more information on how to update." => "%s mevcut. Güncelleştirme hakkında daha fazla bilgi alın.",
 "Log out" => "Çıkış yap",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 14c044161da..f6bcfdcdc8d 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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" => "Невірне зображення",
@@ -52,6 +49,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "Помилка при завантаженні шаблону повідомлення: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
 "One file conflict" => "Один файловий конфлікт",
+"New Files" => "Нових Файлів",
 "Which files do you want to keep?" => "Які файли ви хочете залишити?",
 "If you select both versions, the copied file will have a number added to its name." => "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я.",
 "Cancel" => "Відмінити",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index f62c5fd6152..319f68b6355 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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",
-"Updating filecache, this may take really long..." => "Đang cập nhật tập tin bộ nhớ cache, việc này có thể mất nhiều thời gian...",
-"Updated filecache" => "Đã cập nhật tập tin bộ nhớ cache",
-"... %d%% done ..." => "... %d%% hoàn thành ...",
 "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ệ",
@@ -52,6 +49,7 @@ $TRANSLATIONS = 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",
+"New Files" => "File mới",
 "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",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index de00cfc69f8..68f50baf98f 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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" => "无效的图像",
@@ -52,6 +49,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "加载消息模板出错: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
 "One file conflict" => "1个文件冲突",
+"New Files" => "新文件",
 "Which files do you want to keep?" => "想要保留哪一个文件呢？",
 "If you select both versions, the copied file will have a number added to its name." => "如果同时选择了连个版本，复制的文件名将会添加上一个数字。",
 "Cancel" => "取消",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 8529fb5e5f8..0799344697a 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -4,9 +4,6 @@ $TRANSLATIONS = array(
 "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" => "無效的圖片",
@@ -52,6 +49,7 @@ $TRANSLATIONS = array(
 "Error loading message template: {error}" => "載入訊息樣板出錯： {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案衝突"),
 "One file conflict" => "一個檔案衝突",
+"New Files" => "新檔案",
 "Which files do you want to keep?" => "您要保留哪一個檔案？",
 "If you select both versions, the copied file will have a number added to its name." => "如果您同時選擇兩個版本，被複製的那個檔案名稱後面會加上編號",
 "Cancel" => "取消",
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index 0ab32acca60..881455f5a9d 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -1,14 +1,14 @@
-<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_reset', $_['args']) ?>" method="post">
+<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_reset', $_['args'])) ?>" method="post">
 	<fieldset>
 		<?php if($_['success']): ?>
-			<h1><?php echo $l->t('Your password was reset'); ?></h1>
-			<p><a href="<?php echo OC_Helper::linkTo('', 'index.php') ?>/"><?php echo $l->t('To login page'); ?></a></p>
+			<h1><?php p($l->t('Your password was reset')); ?></h1>
+			<p><a href="<?php print_unescaped(OC_Helper::linkTo('', 'index.php')) ?>/"><?php p($l->t('To login page')); ?></a></p>
 		<?php else: ?>
 			<p class="infield">
-				<label for="password" class="infield"><?php echo $l->t( 'New password' ); ?></label>
+				<label for="password" class="infield"><?php p($l->t('New password')); ?></label>
 				<input type="password" name="password" id="password" value="" required />
 			</p>
-			<input type="submit" id="submit" value="<?php echo $l->t('Reset password'); ?>" />
+			<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
 		<?php endif; ?>
 	</fieldset>
 </form>
diff --git a/core/routes.php b/core/routes.php
index 76cf03c3673..74be8806120 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');
 
diff --git a/core/setup/controller.php b/core/setup/controller.php
index 697408cfb57..1a8e9b2b764 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/layout.guest.php b/core/templates/layout.guest.php
index 91157b923a5..5788d1d5bd3 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 3d897503480..ba5f6ef9b54 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/cron.php b/cron.php
index 44ca421328b..8fa72a319c0 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 0a2f15f9f5e..bd94d0e908d 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/ach/core.po b/l10n/ach/core.po
index 74d82612202..ca25a26988f 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/ach/files.po b/l10n/ach/files.po
index 0d5c1212cf4..2ec8af4d0e2 100644
--- a/l10n/ach/files.po
+++ b/l10n/ach/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ach\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ach/files_external.po b/l10n/ach/files_external.po
index 777e81342ef..5170057923b 100644
--- a/l10n/ach/files_external.po
+++ b/l10n/ach/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po
index c338a1ca543..3e9a97a32ff 100644
--- a/l10n/ach/lib.po
+++ b/l10n/ach/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
index b36c8be6ba4..ebba9b13098 100644
--- a/l10n/ach/settings.po
+++ b/l10n/ach/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po
index 8516b5a6fea..8ca354d2020 100644
--- a/l10n/ach/user_ldap.po
+++ b/l10n/ach/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index f3f11c8eaeb..3c1f515e05a 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/ady/files.po b/l10n/ady/files.po
index 7aa54f0efa4..12f59cbc7bc 100644
--- a/l10n/ady/files.po
+++ b/l10n/ady/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ady\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ady/files_external.po b/l10n/ady/files_external.po
index c764d6453e2..777a46c36c5 100644
--- a/l10n/ady/files_external.po
+++ b/l10n/ady/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ady/lib.po b/l10n/ady/lib.po
index 0a215aa3587..07c60bce626 100644
--- a/l10n/ady/lib.po
+++ b/l10n/ady/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po
index b5a1d179782..334e9c42e7f 100644
--- a/l10n/ady/settings.po
+++ b/l10n/ady/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ady/user_ldap.po b/l10n/ady/user_ldap.po
index 705677146f4..04cdd0397c4 100644
--- a/l10n/ady/user_ldap.po
+++ b/l10n/ady/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 4fbf58f9d96..2dd7b1f1a45 100644
--- a/l10n/af/core.po
+++ b/l10n/af/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/af/files.po b/l10n/af/files.po
index 0214d96486c..e56f84e1091 100644
--- a/l10n/af/files.po
+++ b/l10n/af/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: af\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/af/files_external.po b/l10n/af/files_external.po
index f3768b60b64..847f55e6e06 100644
--- a/l10n/af/files_external.po
+++ b/l10n/af/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/af/lib.po b/l10n/af/lib.po
index 9567765edb2..c571917f3e9 100644
--- a/l10n/af/lib.po
+++ b/l10n/af/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index af8fee54359..d312d89bbf6 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/af/user_ldap.po b/l10n/af/user_ldap.po
index 32c77bec4a9..b0e9bc1b3ab 100644
--- a/l10n/af/user_ldap.po
+++ b/l10n/af/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 0e240e04832..38344accb9b 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ msgstr "Nuwe wagwoord"
 msgid "Reset password"
 msgstr "Herstel wagwoord"
 
+#: 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 "Persoonlik"
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index ba81bbfb0a3..24833c8a10e 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: af_ZA\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index 11027ed9780..03a9505a520 100644
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Gebruikers"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 6dcb6dbbdf1..47d21e1c5b7 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 040f1b78f06..92e777a3d53 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 4f4ab643287..581eb34d236 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index 424006a02cd..1fd891dc6ef 100644
--- a/l10n/ak/core.po
+++ b/l10n/ak/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/ak/files.po b/l10n/ak/files.po
index 8f4a06ccd36..73d266f53a1 100644
--- a/l10n/ak/files.po
+++ b/l10n/ak/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ak\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ak/files_external.po b/l10n/ak/files_external.po
index 7ee8bbb3a5b..84c7c7e4042 100644
--- a/l10n/ak/files_external.po
+++ b/l10n/ak/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ak/lib.po b/l10n/ak/lib.po
index 2747783c021..1404a2e7a6a 100644
--- a/l10n/ak/lib.po
+++ b/l10n/ak/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po
index 5ffaa25d81b..cb7953cc98c 100644
--- a/l10n/ak/settings.po
+++ b/l10n/ak/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ak/user_ldap.po b/l10n/ak/user_ldap.po
index 537c7c79d09..2dae2aaf95c 100644
--- a/l10n/ak/user_ldap.po
+++ b/l10n/ak/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 00000000000..e66052cc04c
--- /dev/null
+++ b/l10n/am_ET/core.po
@@ -0,0 +1,809 @@
+# 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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+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:479
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:564
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1124
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1125
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1126
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1127
+msgid "today"
+msgstr ""
+
+#: js/js.js:1128
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1129
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1130
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1131
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1132
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1133
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1134
+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 "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:379
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:389
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:460
+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: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 ""
+
+#: 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 00000000000..22104ecccff
--- /dev/null
+++ b/l10n/am_ET/files.po
@@ -0,0 +1,408 @@
+# 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-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
+
+#: 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:145
+#: 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:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+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:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:107
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:159
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:169
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:184
+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:542
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:546
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:548 js/filelist.js:603
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:600
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:613
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:653
+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:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:630
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:789
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:822
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:1052 js/filelist.js:1090
+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:331
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:570 templates/index.php:67
+msgid "Name"
+msgstr ""
+
+#: js/files.js:571 templates/index.php:79
+msgid "Size"
+msgstr ""
+
+#: js/files.js:572 templates/index.php:81
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:93
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:22
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:5
+msgid "New"
+msgstr ""
+
+#: templates/index.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:51
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:56
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:84 templates/index.php:85
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:96
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:98
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:103
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:106
+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 00000000000..ee25cebfde9
--- /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 00000000000..7b7292cc4f9
--- /dev/null
+++ b/l10n/am_ET/files_external.po
@@ -0,0 +1,136 @@
+# 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-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
+
+#: 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:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:626
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:628
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+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 00000000000..5df40a55708
--- /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 00000000000..5c0bf63448b
--- /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 00000000000..63482f68050
--- /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 00000000000..2412812c9c1
--- /dev/null
+++ b/l10n/am_ET/lib.po
@@ -0,0 +1,356 @@
+# 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-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
+
+#: 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:232
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:233
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:234 private/files.php:262
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:259
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:260
+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:72
+#: private/share/mailnotifications.php:118
+#, 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 ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po
new file mode 100644
index 00000000000..f2886d1023c
--- /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 00000000000..0dc3459fe7e
--- /dev/null
+++ b/l10n/am_ET/user_ldap.po
@@ -0,0 +1,534 @@
+# 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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/pl_PL/user_webdavauth.po b/l10n/am_ET/user_webdavauth.po
index 2ac39a46211..effb19c1696 100644
--- a/l10n/pl_PL/user_webdavauth.po
+++ b/l10n/am_ET/user_webdavauth.po
@@ -6,28 +6,28 @@
 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: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\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: pl_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"
+"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 "URL: http://"
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index f6d7bc666cc..a92aaeb919f 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.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
 # blackcoder <tarek.taha@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 18:50+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,47 +19,38 @@ 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:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
 
 #: 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"
@@ -70,7 +62,7 @@ msgstr ""
 
 #: js/config.php:36
 msgid "Sunday"
-msgstr "الاحد"
+msgstr "الأحد"
 
 #: js/config.php:37
 msgid "Monday"
@@ -144,19 +136,19 @@ msgstr "تشرين الثاني"
 msgid "December"
 msgstr "كانون الاول"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "إعدادات"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "جاري الحفظ..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -166,7 +158,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -176,15 +168,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -194,11 +186,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -208,15 +200,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "شهر مضى"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "سنة مضت"
 
@@ -259,42 +251,50 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "الغاء"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "كلمة السر ضعيفة جدا"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "كلمة السر ضعيفة"
 
 #: js/setup.js:86
 msgid "So-so password"
@@ -302,11 +302,11 @@ msgstr ""
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "كلمة السر جيدة"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "كلمة السر قوية"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -317,11 +317,11 @@ msgid "Share"
 msgstr "شارك"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "خطأ"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "حصل خطأ عند عملية المشاركة"
 
@@ -437,19 +437,19 @@ msgstr "محمي بكلمة السر"
 msgid "Error unsetting expiration date"
 msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "جاري الارسال ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "تم ارسال البريد الالكتروني"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "تحذير"
 
@@ -499,7 +499,7 @@ msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان
 #: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "تمت إعادة ضبط كلمة مرور %s"
 
 #: lostpassword/controller.php:72
 msgid ""
@@ -541,7 +541,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"
@@ -563,6 +563,18 @@ 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 "شخصي"
@@ -650,7 +662,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 ""
@@ -675,7 +687,7 @@ 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>"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index bab63e292ea..e26fbcba883 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 21:00+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -19,48 +19,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/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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "اسم الملف لا يجوز أن يكون فارغا"
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها"
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -70,74 +70,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "غير قادر على تحميل المجلد"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "علامة غير صالحة"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "لم يتم رفع أي ملف , خطأ غير معروف"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "تم ترفيع الملفات بنجاح."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "حجم الملف المرفوع تجاوز قيمة  upload_max_filesize الموجودة في ملف php.ini "
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "لم يتم ترفيع أي من الملفات"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "المجلد المؤقت غير موجود"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "خطأ في الكتابة على القرص الصلب"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "لا يوجد مساحة تخزينية كافية"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "*فشلت علمية الرفع. تعذر إيجاد الملف الذي تم رفعه.\n*فشلت علمية التحميل. تعذر إيجاد الملف الذي تم تحميله."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "فشلت عملية الرفع. تعذر الحصول على معلومات الملف."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "مسار غير صحيح."
 
@@ -158,76 +158,76 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "تم إلغاء عملية رفع الملفات ."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "تعذر الحصول على نتيجة من الخادم"
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} موجود مسبقا"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "شارك"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "حذف بشكل دائم"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "إعادة تسميه"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "حدث خطأ أثناء نقل الملف"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "خطأ"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "استبدل {new_name}  بـ  {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "تراجع"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "لا يوجد مجلدات %n"
@@ -237,7 +237,7 @@ msgstr[3] "عدد قليل من مجلدات %n"
 msgstr[4] "عدد كبير من مجلدات %n"
 msgstr[5] "مجلدات %n"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "لا يوجد ملفات %n"
@@ -247,11 +247,11 @@ msgstr[3] "قليل من ملفات %n"
 msgstr[4] "الكثير من ملفات %n"
 msgstr[5] " ملفات %n"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} و {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "لا يوجد ملفات %n لتحميلها"
@@ -292,29 +292,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك."
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "معدل"
 
@@ -322,113 +314,109 @@ msgstr "معدل"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s  لا يمكن إعادة تسميته. "
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "رفع"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "التعامل مع الملف"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "الحد الأقصى لحجم الملفات التي يمكن رفعها"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "الحد الأقصى المسموح به"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "اجباري للسماح بالتحميل المتعدد للمجلدات والملفات"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "تفعيل خاصية تحميل ملفات ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 = غير محدود"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "الحد الأقصى المسموح به لملفات ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "حفظ"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "جديد"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "ملف"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "مجلد جديد"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "مجلد"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "من رابط"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "حذف الملفات"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "إلغاء رفع الملفات"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "إلغاء"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "يرجى الانتظار , جاري فحص الملفات ."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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 938f63bc23a..570282efb9a 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-19 05:50+0000\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"
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index c2b4c360d91..345a782cd7d 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
+msgstr "حفظ"
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "اسم المجلد"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "خيارات"
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "كل المستخدمين"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "مجموعات"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "المستخدمين"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "إلغاء"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index ef6f0d12859..103ad5d2377 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-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"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: js/share.js:13
 msgid "Shared by {owner}"
-msgstr "مشاركة بواسطة المالك  {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"
@@ -35,27 +36,27 @@ 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:17
 #, php-format
@@ -65,8 +66,8 @@ msgstr "مشاركة من قبل %s"
 #: templates/public.php:44
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "تحميل %s"
 
 #: templates/public.php:48
 msgid "Direct link"
-msgstr ""
+msgstr "رابط مباشر"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index cca82174990..e354e3194c0 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: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-15 05:40+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-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"
@@ -35,9 +36,9 @@ msgstr "حذف الملفات"
 msgid "Error"
 msgstr "خطأ"
 
-#: lib/trashbin.php:853 lib/trashbin.php:855
+#: lib/trashbin.php:859 lib/trashbin.php:861
 msgid "restored"
-msgstr ""
+msgstr "تمت الاستعادة"
 
 #: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index a78e73ae96a..1ac427fb619 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.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
 # suliman <291101251@std.qu.edu.sa>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 08:40+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -56,33 +57,33 @@ msgstr "خطا في ترقية \"%s\"."
 
 #: private/avatar.php:66
 msgid "Unknown filetype"
-msgstr ""
+msgstr "نوع الملف غير معروف"
 
 #: private/avatar.php:71
 msgid "Invalid image"
-msgstr ""
+msgstr "الصورة غير صالحة"
 
 #: private/defaults.php:35
 msgid "web services under your control"
 msgstr "خدمات الشبكة تحت سيطرتك"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "تحميل ملفات ZIP متوقف"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "العودة الى الملفات"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -103,7 +104,7 @@ msgstr ""
 #: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "الأرشيفات من نوع  %s غير مدعومة"
 
 #: private/installer.php:104
 msgid "Failed to open archive when installing app"
@@ -111,7 +112,7 @@ msgstr ""
 
 #: private/installer.php:126
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "التطبيق لا يتوفر على ملف info.xml"
 
 #: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
@@ -137,12 +138,12 @@ msgstr ""
 
 #: private/installer.php:170
 msgid "App directory already exists"
-msgstr ""
+msgstr "مجلد التطبيق موجود مسبقا"
 
 #: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s"
 
 #: private/json.php:29
 msgid "Application is not enabled"
@@ -158,7 +159,7 @@ msgstr "انتهت صلاحية الكلمة , يرجى اعادة تحميل ا
 
 #: private/json.php:75
 msgid "Unknown user"
-msgstr ""
+msgstr "المستخدم غير معروف"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -200,7 +201,7 @@ msgstr "انت بحاجة لكتابة اسم مستخدم موجود أو حس�
 
 #: private/setup/mysql.php:12
 msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "اسم مستخدم أو كلمة مرور MySQL/MariaDB  غير صحيحين"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,7 +229,7 @@ msgstr "الأمر المخالف كان : \"%s\""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "مستخدم MySQL/MariaDB '%s'@'localhost' موجود مسبقا"
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
@@ -241,11 +242,11 @@ msgstr ""
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+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"
@@ -268,22 +269,22 @@ msgstr "اعداد اسم مستخدم للمدير"
 msgid "Set an admin password."
 msgstr "اعداد كلمة مرور للمدير"
 
-#: private/setup.php:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s شارك »%s« معك"
 
 #: private/tags.php:193
 #, php-format
@@ -353,3 +354,21 @@ msgstr "السنةالماضية"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "سنة مضت"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "يجب ادخال اسم مستخدم صحيح"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "يجب ادخال كلمة مرور صحيحة"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index a3d00d9963a..9a4af6d1886 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -4,13 +4,14 @@
 # 
 # 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: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 18:50+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -22,24 +23,24 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "ادخال خاطئ لقيمة %s"
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "حفظ"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "إعدادات البريد التجريبي"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني"
 
 #: admin/controller.php:94
 msgid ""
 "A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "حدث خطأ اثناء ارسال البريد الالكتروني ، الرجاء مراجعة اعداداتك"
 
 #: admin/controller.php:99
 msgid "Email sent"
@@ -49,24 +50,24 @@ msgstr "تم ارسال البريد الالكتروني"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:282
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
-msgstr ""
+msgstr "وضعية الإرسال"
 
-#: admin/controller.php:118 templates/admin.php:295 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "التشفير"
 
-#: admin/controller.php:120 templates/admin.php:319
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
-msgstr ""
+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 "لم يتم التأكد من الشخصية بنجاح"
 
@@ -128,38 +129,38 @@ msgstr "فشل إزالة المستخدم من المجموعة %s"
 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 "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "لا يمكن تغيير كلمة المرور"
 
 #: js/admin.js:73
 msgid "Sending..."
-msgstr ""
+msgstr "جاري الارسال ..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -205,7 +206,7 @@ msgstr "حصل خطأ أثناء تحديث التطبيق"
 msgid "Error"
 msgstr "خطأ"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "حدث"
 
@@ -213,31 +214,31 @@ msgstr "حدث"
 msgid "Updated"
 msgstr "تم التحديث بنجاح"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "اختر صورة الملف الشخصي "
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
-msgstr ""
+msgstr "كلمة السر ضعيفة جدا"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
-msgstr ""
+msgstr "كلمة السر ضعيفة"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
-msgstr ""
+msgstr "كلمة السر جيدة"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
-msgstr ""
+msgstr "كلمة السر قوية"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت."
 
@@ -286,7 +287,7 @@ msgstr "يجب ادخال كلمة مرور صحيحة"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -429,157 +430,173 @@ 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:175
+#: 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 دقيقه"
 
-#: templates/admin.php:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "مشاركة"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "السماح بالمشاركة عن طريق الAPI "
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "السماح للتطبيقات بالمشاركة عن طريق الAPI"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "السماح بالعناوين"
 
-#: templates/admin.php:203
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
 
-#: templates/admin.php:210
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "السماح بالرفع للعامة "
 
-#: templates/admin.php:211
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "السماح للمستخدمين بتفعيل الرفع للاخرين من خلال مجلد المشاركة العام "
 
-#: templates/admin.php:218
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "السماح بإعادة المشاركة "
 
-#: templates/admin.php:219
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
 
-#: templates/admin.php:226
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد  "
 
-#: templates/admin.php:229
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "السماح بتنبيهات البريد الالكتروني."
 
-#: templates/admin.php:237
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "السماح للمستخدم الى ارسال تنبيه البريد الالكتروني للملفات المشتركة "
 
-#: templates/admin.php:244
+#: templates/admin.php:261
 msgid "Security"
 msgstr "حماية"
 
-#: templates/admin.php:257
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "فرض HTTPS"
 
-#: templates/admin.php:259
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر"
 
-#: templates/admin.php:265
+#: 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:277
+#: templates/admin.php:294
 msgid "Email Server"
-msgstr ""
+msgstr "خادم البريد الالكتروني"
 
-#: templates/admin.php:279
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:310
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:332
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:336
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "عنوان الخادم"
 
-#: templates/admin.php:340
+#: templates/admin.php:357
 msgid "Port"
-msgstr ""
+msgstr "المنفذ"
 
-#: templates/admin.php:345
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:346
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:349
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:353
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:354
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:359
+#: templates/admin.php:376
 msgid "Log"
 msgstr "سجل"
 
-#: templates/admin.php:360
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "مستوى السجل"
 
-#: templates/admin.php:392
+#: templates/admin.php:409
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:393
+#: templates/admin.php:410
 msgid "Less"
 msgstr "أقل"
 
-#: templates/admin.php:399 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:403 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +614,23 @@ msgstr "أضف تطبيقاتك"
 msgid "More Apps"
 msgstr "المزيد من التطبيقات"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "إختر تطبيقاً"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "التوثيق"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "راجع صفحة التطبيق على apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>"
 
@@ -650,108 +667,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "لقد تم تغيير كلمة السر"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "لم يتم تعديل كلمة السر بنجاح"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "كلمات السر الحالية"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "كلمات سر جديدة"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "عدل كلمة السر"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "اسمك الكامل"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "البريد الإلكترونى"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "عنوانك البريدي"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "صورة الملف الشخصي"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "رفع الان"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "اختر جديد من الملفات "
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "احذف الصورة "
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "سواء png او jpg. بامكانك قص الصورة "
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "الغاء"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "اختر صورة الملف الشخصي"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "اللغة"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "ساعد في الترجمه"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك"
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "كلمه سر الدخول"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "فك تشفير جميع الملفات "
 
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index e3a5525e842..3b92bebccea 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -3,12 +3,13 @@
 # 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: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 06:50+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -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,7 +81,7 @@ msgstr ""
 
 #: js/settings.js:128
 msgid "Success"
-msgstr ""
+msgstr "نجاح"
 
 #: js/settings.js:133
 msgid "Error"
@@ -243,7 +244,7 @@ msgstr ""
 
 #: templates/part.wizard-server.php:36
 msgid "Port"
-msgstr ""
+msgstr "المنفذ"
 
 #: templates/part.wizard-server.php:44
 msgid "User DN"
@@ -427,41 +428,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
-msgstr ""
+msgstr "خانة البريد الإلكتروني"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -477,15 +489,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -496,19 +508,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -522,10 +534,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
new file mode 100644
index 00000000000..145a76968a8
--- /dev/null
+++ b/l10n/ast/core.po
@@ -0,0 +1,810 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 21:20+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr "Base de datos anovada"
+
+#: 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 "Imaxe inválida"
+
+#: 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 "Domingu"
+
+#: js/config.php:37
+msgid "Monday"
+msgstr "Llunes"
+
+#: js/config.php:38
+msgid "Tuesday"
+msgstr "Martes"
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr "Xueves"
+
+#: js/config.php:41
+msgid "Friday"
+msgstr "Vienres"
+
+#: js/config.php:42
+msgid "Saturday"
+msgstr "Sábadu"
+
+#: js/config.php:47
+msgid "January"
+msgstr "Xineru"
+
+#: js/config.php:48
+msgid "February"
+msgstr "Febreru"
+
+#: js/config.php:49
+msgid "March"
+msgstr "Marzu"
+
+#: js/config.php:50
+msgid "April"
+msgstr "Abril"
+
+#: js/config.php:51
+msgid "May"
+msgstr "Mayu"
+
+#: js/config.php:52
+msgid "June"
+msgstr "Xunu"
+
+#: js/config.php:53
+msgid "July"
+msgstr "Xunetu"
+
+#: js/config.php:54
+msgid "August"
+msgstr "Agostu"
+
+#: js/config.php:55
+msgid "September"
+msgstr "Setiembre"
+
+#: js/config.php:56
+msgid "October"
+msgstr "Ochobre"
+
+#: js/config.php:57
+msgid "November"
+msgstr "Payares"
+
+#: js/config.php:58
+msgid "December"
+msgstr "Avientu"
+
+#: js/js.js:479
+msgid "Settings"
+msgstr "Axustes"
+
+#: js/js.js:564
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1099
+msgid "seconds ago"
+msgstr "fai segundos"
+
+#: js/js.js:1100
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "fai %n minutu"
+msgstr[1] "fai %n minutos"
+
+#: js/js.js:1101
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "fai %n hora"
+msgstr[1] "fai %n hores"
+
+#: js/js.js:1102
+msgid "today"
+msgstr "güei"
+
+#: js/js.js:1103
+msgid "yesterday"
+msgstr "ayeri"
+
+#: js/js.js:1104
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "fai %n día"
+msgstr[1] "fai %n díes"
+
+#: js/js.js:1105
+msgid "last month"
+msgstr "mes caberu"
+
+#: js/js.js:1106
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "fai %n mes"
+msgstr[1] "fai %n meses"
+
+#: js/js.js:1107
+msgid "months ago"
+msgstr "fai meses"
+
+#: js/js.js:1108
+msgid "last year"
+msgstr "añu caberu"
+
+#: js/js.js:1109
+msgid "years ago"
+msgstr "fai años"
+
+#: js/oc-dialogs.js:125
+msgid "Choose"
+msgstr "Esbillar"
+
+#: js/oc-dialogs.js:151
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Yes"
+msgstr "Sí"
+
+#: js/oc-dialogs.js:187
+msgid "No"
+msgstr "Non"
+
+#: js/oc-dialogs.js:204
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:224
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:352
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:366
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:372
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:373
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:375
+msgid "Which files do you want to keep?"
+msgstr "¿Qué ficheros quies caltener?"
+
+#: js/oc-dialogs.js:376
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:384
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: js/oc-dialogs.js:394
+msgid "Continue"
+msgstr "Continuar"
+
+#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:457
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:465
+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 "Compartíu"
+
+#: js/share.js:109
+msgid "Share"
+msgstr "Compartir"
+
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
+msgid "Error"
+msgstr "Fallu"
+
+#: 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 "Compartir enllaz"
+
+#: js/share.js:223
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
+
+#: 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 "Unviar"
+
+#: 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 "grupu"
+
+#: 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 "Dexar de compartir"
+
+#: js/share.js:409
+msgid "notify by email"
+msgstr "notificar per corréu"
+
+#: js/share.js:412
+msgid "can edit"
+msgstr "pue editar"
+
+#: js/share.js:414
+msgid "access control"
+msgstr "control d'accesu"
+
+#: js/share.js:417
+msgid "create"
+msgstr "crear"
+
+#: js/share.js:420
+msgid "update"
+msgstr "xubir"
+
+#: js/share.js:423
+msgid "delete"
+msgstr "desaniciar"
+
+#: js/share.js:426
+msgid "share"
+msgstr "compartir"
+
+#: js/share.js:698
+msgid "Password protected"
+msgstr "Contraseña protexida"
+
+#: 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 "Corréu unviáu"
+
+#: 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 "Desaniciar"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr "Amestar"
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr "Editar etiquetes"
+
+#: 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 "Nome d'usuariu"
+
+#: 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 "Reaniciar"
+
+#: 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: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 "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar."
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Personal"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Usuarios"
+
+#: 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 "¡Salú!"
+
+#: 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 "usaráse"
+
+#: 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 "Finando ..."
+
+#: 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 "Zarrar sesión"
+
+#: 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 "¿Escaeciesti la to contraseña?"
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr "Aniciar sesión"
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr "Anicios de sesión alternativos"
+
+#: 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 "Gracies pola to paciencia."
+
+#: 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/ast/files.po b/l10n/ast/files.po
new file mode 100644
index 00000000000..03e4145bb31
--- /dev/null
+++ b/l10n/ast/files.po
@@ -0,0 +1,408 @@
+# 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-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 21:20+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\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 "El nome de ficheru nun pue quedar baleru."
+
+#: 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 "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
+#: 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:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+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:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr "Nun se xubió dengún ficheru. Fallu desconocíu"
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr "Nun hai dengún fallu, el ficheru xubióse ensin problemes"
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "El ficheru xubíu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML"
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr "El ficheru xubióse de mou parcial"
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr "Nun se xubió dengún ficheru"
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr "Falta una carpeta temporal"
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr "Fallu al escribir al discu"
+
+#: ajax/upload.php:107
+msgid "Not enough storage available"
+msgstr "Nun hai abondu espaciu disponible"
+
+#: ajax/upload.php:159
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:169
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:184
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr "Ficheros"
+
+#: 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:542
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:546
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:548 js/filelist.js:587
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:600
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:613
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:653
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:164
+msgid "Share"
+msgstr "Compartir"
+
+#: js/fileactions.js:177
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:238
+msgid "Rename"
+msgstr "Renomar"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Fallu"
+
+#: js/filelist.js:251 js/filelist.js:1101
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:614
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:777
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:802 js/filelist.js:879 js/files.js:589
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:803 js/filelist.js:880 js/files.js:595
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:810
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:1040 js/filelist.js:1078
+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:331
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:570 templates/index.php:67
+msgid "Name"
+msgstr "Nome"
+
+#: js/files.js:571 templates/index.php:79
+msgid "Size"
+msgstr "Tamañu"
+
+#: js/files.js:572 templates/index.php:81
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:93
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:22
+msgid "Upload"
+msgstr "Xubir"
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr "Guardar"
+
+#: templates/index.php:5
+msgid "New"
+msgstr ""
+
+#: templates/index.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "New folder"
+msgstr "Nueva carpeta"
+
+#: templates/index.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Cancel upload"
+msgstr "Encaboxar xuba"
+
+#: templates/index.php:51
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:56
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/index.php:84 templates/index.php:85
+msgid "Delete"
+msgstr "Desaniciar"
+
+#: templates/index.php:96
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:98
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:103
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:106
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/ast/files_encryption.po b/l10n/ast/files_encryption.po
new file mode 100644
index 00000000000..61be80edefc
--- /dev/null
+++ b/l10n/ast/files_encryption.po
@@ -0,0 +1,202 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 21:40+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\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 "Contraseña camudada esitosamente."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Nun pue camudase la contraseña. Quiciabes la contraseña vieya nun fore correuta."
+
+#: 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 "axustes personales"
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr "Cifráu"
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr "Habilitáu"
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr "Deshabilitáu"
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr "Camudar conseña"
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "Si nun recuerdes la to contraseña vieya pues entrugar al to alministrador pa recuperar los tos ficheros."
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr "Nun pue anovase'l ficheru de recuperación"
diff --git a/l10n/ast/files_external.po b/l10n/ast/files_external.po
new file mode 100644
index 00000000000..ac5c5b82314
--- /dev/null
+++ b/l10n/ast/files_external.po
@@ -0,0 +1,136 @@
+# 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-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 21:20+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\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:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:626
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:628
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr "Nome de la carpeta"
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr "Opciones"
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr "Grupos"
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr "Usuarios"
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr "Desaniciar"
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ast/files_sharing.po b/l10n/ast/files_sharing.po
new file mode 100644
index 00000000000..9154e9f56e5
--- /dev/null
+++ b/l10n/ast/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-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 20:00+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:33
+msgid "Shared by {owner}"
+msgstr "Compartíu por {owner}"
+
+#: 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 "Contraseña"
+
+#: 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/ast/files_trashbin.po b/l10n/ast/files_trashbin.po
new file mode 100644
index 00000000000..180064b93cb
--- /dev/null
+++ b/l10n/ast/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-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 21:20+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\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:3
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+msgid "Error"
+msgstr "Fallu"
+
+#: js/trash.js:264
+msgid "Deleted Files"
+msgstr ""
+
+#: lib/trashbin.php:859 lib/trashbin.php:861
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:6
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:19
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:22 templates/index.php:24
+msgid "Restore"
+msgstr "Restaurar"
+
+#: templates/index.php:30
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:33 templates/index.php:34
+msgid "Delete"
+msgstr "Desaniciar"
diff --git a/l10n/ast/files_versions.po b/l10n/ast/files_versions.po
new file mode 100644
index 00000000000..2fdf419af52
--- /dev/null
+++ b/l10n/ast/files_versions.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 21:40+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr "Versiones"
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr "Más versiones..."
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr "Nun hai otres versiones disponibles"
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr "Restaurar"
diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po
new file mode 100644
index 00000000000..7608549ac6d
--- /dev/null
+++ b/l10n/ast/lib.po
@@ -0,0 +1,357 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 09:20+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\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 "Personal"
+
+#: private/app.php:377
+msgid "Settings"
+msgstr "Axustes"
+
+#: private/app.php:389
+msgid "Users"
+msgstr "Usuarios"
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:875
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Fallu al anovar \"%s\"."
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr "Imaxe inválida"
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:232
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:233
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:234 private/files.php:262
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:259
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:260
+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 "L'aplicación nun ta habilitada"
+
+#: 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 "Ficheros"
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr "Testu"
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr "Imaxes"
+
+#: 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 "Afitar nome d'usuariu p'almin"
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr "Afitar contraseña p'almin"
+
+#: 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:72
+#: private/share/mailnotifications.php:118
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "Nun pudo alcontrase la estaya \"%s.\""
+
+#: private/template/functions.php:133
+msgid "seconds ago"
+msgstr "fai segundos"
+
+#: private/template/functions.php:134
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] "fai %n minutos"
+
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] "fai %n hores"
+
+#: private/template/functions.php:136
+msgid "today"
+msgstr "güei"
+
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr "ayeri"
+
+#: private/template/functions.php:139
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] "fai %n díes"
+
+#: private/template/functions.php:141
+msgid "last month"
+msgstr "mes caberu"
+
+#: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] "fai %n meses"
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr "añu caberu"
+
+#: private/template/functions.php:145
+msgid "years ago"
+msgstr "fai años"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po
new file mode 100644
index 00000000000..0c2cf566e17
--- /dev/null
+++ b/l10n/ast/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-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 21:20+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\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 "Corréu unviáu"
+
+#: 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:149
+msgid "Encryption"
+msgstr "Cifráu"
+
+#: 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:49
+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 "Solicitú non válida"
+
+#: 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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+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 "Fallu"
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:243
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:274
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:275
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:276
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:313
+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 "Grupos"
+
+#: 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 "Desaniciar"
+
+#: 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:48 personal.php:49
+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 "Más"
+
+#: templates/admin.php:410
+msgid "Less"
+msgstr "Menos"
+
+#: templates/admin.php:416 templates/personal.php:171
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 templates/personal.php:174
+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:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr "Contraseña"
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr "Corréu-e"
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:137
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:139
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:157
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:162
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr "Crear"
+
+#: 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 "Otru"
+
+#: templates/users.php:85
+msgid "Username"
+msgstr "Nome d'usuariu"
+
+#: 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/ast/user_ldap.po b/l10n/ast/user_ldap.po
new file mode 100644
index 00000000000..2ee3b4bb024
--- /dev/null
+++ b/l10n/ast/user_ldap.po
@@ -0,0 +1,534 @@
+# 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-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 21:20+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\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 "Falló'l borráu"
+
+#: 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 "Fallu"
+
+#: 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:983
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr "Guardar"
+
+#: 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 "Contraseña"
+
+#: 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 "Continuar"
+
+#: 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:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/ast/user_webdavauth.po b/l10n/ast/user_webdavauth.po
new file mode 100644
index 00000000000..2aa9fcebe56
--- /dev/null
+++ b/l10n/ast/user_webdavauth.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Iñigo Varela <ivarela@softastur.org>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 17:50+0000\n"
+"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr "Autenticación per aciu de WevDAV"
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr "Direición:"
+
+#: templates/settings.php:6
+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 "Les credenciales d'usuariu van unviase a esta direición. Esti complementu verifica la rempuesta y va interpretar los códigos de rempuesta HTTP 401 y 403 como credenciales inválides y toles otres rempuestes como credenciales válides."
diff --git a/l10n/az/core.po b/l10n/az/core.po
index abe8918244a..16e53892b8e 100644
--- a/l10n/az/core.po
+++ b/l10n/az/core.po
@@ -7,46 +7,37 @@ 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:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -227,38 +222,47 @@ msgstr ""
 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?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -411,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -537,6 +541,18 @@ 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 ""
diff --git a/l10n/az/files.po b/l10n/az/files.po
index 10ee0d16dab..8d82454375a 100644
--- a/l10n/az/files.po
+++ b/l10n/az/files.po
@@ -7,58 +7,58 @@ 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:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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
+#: 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,93 +156,96 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
+msgstr[1] ""
 
 #: js/files.js:96
 msgid "\"{name}\" is an invalid file name."
@@ -275,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -305,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/az/files_external.po b/l10n/az/files_external.po
index d40759fe06b..444bc71d9ef 100644
--- a/l10n/az/files_external.po
+++ b/l10n/az/files_external.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
 
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/az/lib.po b/l10n/az/lib.po
index 75015cb94cd..7c931cb158b 100644
--- a/l10n/az/lib.po
+++ b/l10n/az/lib.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
 
 #: private/app.php:236
 #, php-format
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -297,11 +297,13 @@ msgstr ""
 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"
@@ -315,6 +317,7 @@ msgstr ""
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
+msgstr[1] ""
 
 #: private/template/functions.php:141
 msgid "last month"
@@ -324,6 +327,7 @@ msgstr ""
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
+msgstr[1] ""
 
 #: private/template/functions.php:144
 msgid "last year"
@@ -332,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/az/settings.po b/l10n/az/settings.po
index 3865826ed1c..b43ce968a40 100644
--- a/l10n/az/settings.po
+++ b/l10n/az/settings.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/az/user_ldap.po b/l10n/az/user_ldap.po
index 5aaa8ff5dcf..df36a475ca0 100644
--- a/l10n/az/user_ldap.po
+++ b/l10n/az/user_ldap.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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/clearMappings.php:34
 msgid "Failed to clear the mappings."
@@ -131,12 +131,14 @@ msgstr ""
 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"
@@ -417,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 4e7fa8e377c..08ac377c071 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,19 +135,19 @@ msgstr "Лістапад"
 msgid "December"
 msgstr "Снежань"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Налады"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "Секунд таму"
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -164,7 +155,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -172,15 +163,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr "Сёння"
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "Ўчора"
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -188,11 +179,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr "У мінулым месяцы"
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -200,15 +191,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr "Месяцаў таму"
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr "У мінулым годзе"
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr "Гадоў таму"
 
@@ -249,32 +240,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -307,11 +306,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Памылка"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -427,19 +426,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -553,6 +552,18 @@ 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 ""
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 88ce254af97..66801d9d684 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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,48 +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"
 
-#: 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,76 +156,76 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Памылка"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -233,7 +233,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -241,11 +241,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -284,29 +284,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -314,113 +306,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index acee78a7114..3df60f9dbbf 100644
--- a/l10n/be/files_external.po
+++ b/l10n/be/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index d3648c9b694..3a42b36b154 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -344,3 +344,21 @@ msgstr "У мінулым годзе"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "Гадоў таму"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 89a49c03c77..1209b101c88 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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index 766cac335ef..ba05cf01fbb 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -423,41 +423,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -473,15 +484,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -518,10 +529,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index cd08d909fc5..53dbcfcf824 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# cybertorture <cybertorture@gmail.com>, 2014
+# cybertorture, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,63 +135,63 @@ msgstr "Ноември"
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Записване..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "Преди месеци"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "последните години"
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Отказ"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr "Споделяне"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Грешка при споделяне"
 
@@ -367,7 +366,7 @@ msgstr "Не са открити хора"
 
 #: js/share.js:324 js/share.js:363
 msgid "group"
-msgstr ""
+msgstr "група"
 
 #: js/share.js:335
 msgid "Resharing is not allowed"
@@ -417,19 +416,19 @@ msgstr "Защитено с парола"
 msgid "Error unsetting expiration date"
 msgstr "Грешка при премахване на дата за изтичане"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Грепка при поставяне на дата за изтичане"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Изпращам ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Пощата е изпратена"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Внимание"
 
@@ -543,6 +542,18 @@ 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 "Лични"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 20623b2547f..d5beae81b19 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Файлът е качен успешно"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файлът е качен частично"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Фахлът не бе качен"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Липсва временна папка"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Възникна проблем при запис в диска"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Невалидна директория."
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Споделяне"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Изтриване завинаги"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Грешка"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Променено"
 
@@ -308,113 +300,109 @@ msgstr "Променено"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Качване"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Максимален размер за качване"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "Ползвайте 0 за без ограничения"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Запис"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ново"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Текстов файл"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Нова папка"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Спри качването"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Няма нищо тук. Качете нещо."
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Изтриване"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Файлът който сте избрали за качване е прекалено голям"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Файловете се претърсват, изчакайте."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 4f7917a6fb1..f748e7dfd71 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Външно хранилище"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Име на папката"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Опции"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Приложимо"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Няма избрано"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Всички потребители"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Потребители"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Изтриване"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Вкл. на поддръжка за външно потр. хранилище"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL основни сертификати"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Импортиране на основен сертификат"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 602638fe77c..2f128367a94 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -66,23 +66,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "уеб услуги под Ваш контрол"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Изтеглянето като ZIP е изключено."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Файловете трябва да се изтеглят един по един."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Назад към файловете"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните файлове са прекалено големи за генерирането на ZIP архив."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Невалидно MS SQL потребителско име и/или парола: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Необходимо е да влезете в всъществуващ акаунт или като администратора"
 
@@ -207,9 +207,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Грешка в базата от данни: \"%s\""
@@ -218,9 +218,9 @@ msgstr "Грешка в базата от данни: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Проблемната команда беше: \"%s\""
@@ -256,7 +256,7 @@ msgstr "Невалидно Oracle потребителско име и/или п
 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,19 +268,19 @@ msgstr "Въведете потребителско име за админист
 msgid "Set an admin password."
 msgstr "Въведете парола за администратор."
 
-#: private/setup.php:198
+#: 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 "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -337,3 +337,21 @@ msgstr "последната година"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "последните години"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 2536afc6938..1b3b08d1c86 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr "Пощата е изпратена"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "Криптиране"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "Обновяване"
 msgid "Updated"
 msgstr "Обновено"
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Крон"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Споделяне"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Адрес на сървъра"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Още"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "По-малко"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 658e5fef623..240293f936f 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 70f0d9e4627..de3aa807873 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr "নভেম্বর"
 msgid "December"
 msgstr "ডিসেম্বর"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "গত মাস"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "মাস পূর্বে"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "বাতির"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr "ভাগাভাগি কর"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  "
 
@@ -416,19 +415,19 @@ msgstr "কূটশব্দদ্বারা সুরক্ষিত"
 msgid "Error unsetting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "পাঠানো হচ্ছে......"
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "ই-মেইল পাঠানো হয়েছে"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "সতর্কবাণী"
 
@@ -542,6 +541,18 @@ 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 "ব্যক্তিগত"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index af165f8e24a..3d85042f659 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "ফাইলের নামটি ফাঁকা রাখা যাবে না।"
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।"
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "কোন ফাইল আপলোড করা হয় নি"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "ডিস্কে লিখতে ব্যর্থ"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "ভুল ডিরেক্টরি"
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "সমস্যা"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "ক্রিয়া প্রত্যাহার"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
@@ -308,113 +300,109 @@ msgstr "পরিবর্তিত"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "আপলোড"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "ফাইল হ্যার্ডলিং"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "আপলোডের সর্বোচ্চ আকার"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "অনুমোদিত  সর্বোচ্চ  আকার"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "একাধিক ফাইল এবং ফোল্ডার  ডাউনলোড করার জন্য আবশ্যক।"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP ডাউনলোড সক্রিয় কর"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "০ এর অর্থ অসীম"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP ফাইলের ইনপুটের সর্বোচ্চ আকার"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "সংরক্ষণ"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "নতুন"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "টেক্সট ফাইল"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "ফোল্ডার"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr " লিংক থেকে"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "আপলোড বাতিল কর"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "মুছে"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "আপলোডের আকারটি অনেক বড়"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন "
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 4c506cc3545..ac322b99429 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "দয়া করে সঠিক এবং বৈধ Dropbox app key and
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা "
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "বাহ্যিক সংরক্ষণাগার"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "কনফিগারেসন"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "বিকল্পসমূহ"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "প্রযোজ্য"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "কোনটিই নির্ধারণ করা হয় নি"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "সমস্ত ব্যবহারকারী"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "গোষ্ঠীসমূহ"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "মুছে"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "ব্যবহারকারীর বাহ্যিক সংরক্ষণাগার সক্রিয় কর"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL  রুট সনদপত্র"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "রুট সনদপত্রটি আমদানি করুন"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index dc14b1ce4b3..df86a5c8f8c 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP ডাউনলোড বন্ধ করা আছে।"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "ফাইলে ফিরে চল"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "গত বছর"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "বছর পূর্বে"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index c0055544d1c..6262dfa6513 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr "ই-মেইল পাঠানো হয়েছে"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "সংকেতায়ন"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "পরিবর্ধন"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "নিরাপত্তাজনিত সতর্কতা"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "সার্ভার ঠিকানা"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "পোর্ট"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "বেশী"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "কম"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 5e7729e1d4d..4c9a205b7bf 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "বাইটে"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 673f000c4d5..0b742954372 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,67 +134,67 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Spašavam..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -243,32 +234,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -301,11 +300,11 @@ msgid "Share"
 msgstr "Podijeli"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -421,19 +420,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -547,6 +546,18 @@ 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 ""
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 04fe47a62ca..194ec79a386 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +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/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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,94 +156,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -281,29 +281,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -311,113 +303,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Spasi"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nova fascikla"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Fasikla"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/bs/files_external.po b/l10n/bs/files_external.po
index 5207d2bbb5e..fbe15ff86f7 100644
--- a/l10n/bs/files_external.po
+++ b/l10n/bs/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index ddf2e1f9694..9b1d2f5cc76 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -340,3 +340,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index 1cc7c77d8b9..42c0053daf9 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index 3ec9651aca4..b4625092d33 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 91db7becd51..17d16afe763 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 14:20+0000\n"
-"Last-Translator: aseques <sacoo2@hotmail.com>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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,36 +20,27 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "La data de venciment és en el passat."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No s'ha pogut enviar correu als usuaris següents: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Activat el mode de manteniment"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Desactivat el mode de manteniment"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -146,63 +137,63 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Desembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Configuració"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Desant..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "fa %n minut"
 msgstr[1] "fa %n minuts"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "fa %n hora"
 msgstr[1] "fa %n hores"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "fa %n dies"
 msgstr[1] "fa %n dies"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "fa %n mes"
 msgstr[1] "fa %n mesos"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -241,32 +232,40 @@ msgid "One file conflict"
 msgstr "Un fitxer en conflicte"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Fitxers nous"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Quin fitxer voleu conservar?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continua"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(selecciona-ho tot)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} seleccionats)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Error en carregar la plantilla de fitxer existent"
 
@@ -299,11 +298,11 @@ msgid "Share"
 msgstr "Comparteix"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
@@ -419,19 +418,19 @@ msgstr "Protegeix amb contrasenya"
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data de venciment"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error en establir la data de venciment"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "El correu electrónic s'ha enviat"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Avís"
 
@@ -545,6 +544,18 @@ msgstr "Contrasenya nova"
 msgid "Reset password"
 msgstr "Reinicialitza la contrasenya"
 
+#: 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 té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!"
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 9931cfa3ceb..058d688ffe8 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/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-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 08:40+0000\n"
-"Last-Translator: mickymadsystems <micky@madsystems.cat>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -21,48 +21,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" no es un fitxer vàlid."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "No és un origen vàlid"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "El servidor no té autorització per obrir URLs, comproveu la configuració del servidor"
@@ -72,74 +72,74 @@ msgstr "El servidor no té autorització per obrir URLs, comproveu la configurac
 msgid "Error while downloading %s to %s"
 msgstr "S'ha produït un error en baixar %s a %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "S'ha produït un error en crear la carpeta"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "No es pot establir la carpeta de pujada."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Testimoni no vàlid"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "La pujada ha fallat. El fitxer pujat no s'ha trobat."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
@@ -160,92 +160,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "No hi ha resposta del servidor."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "L'URL no pot ser buit"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "No s'ha pogut crear el fitxer"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "No s'ha pogut crear la carpeta"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Error en obtenir la URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Error en moure el fitxer"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Pendent"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "No es pot canviar el nom de fitxer"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "s'ha substituït {old_name} per {new_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "desfés"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Error en esborrar el fitxer."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetes"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fitxer"
 msgstr[1] "%n fitxers"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} i {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Pujant %n fitxer"
@@ -282,29 +282,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Error en moure el fitxer"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificat"
 
@@ -312,113 +304,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no es pot canviar el nom"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Puja"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Gestió de fitxers"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Mida màxima de pujada"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "màxim possible:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Necessari per fitxers múltiples i baixada de carpetes"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Activa la baixada ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 és sense límit"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Mida màxima d'entrada per fitxers ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Desa"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nou"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nou fitxer de text"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Fitxer de text"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Carpeta nova"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Des d'enllaç"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Fitxers esborrats"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Esborra"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/ca/files_external.po
index 711c32d3266..66fb2423fbd 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 09:02+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 05:55+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"
@@ -39,91 +39,100 @@ msgstr "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Error en configurar l'emmagatzemament Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Desat"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Emmagatzemament extern"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nom de la carpeta"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Emmagatzemament extern"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuració"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Options"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplicable"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Afegeix emmagatzemament"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Cap d'establert"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Tots els usuaris"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Usuaris"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Esborra"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Habilita l'emmagatzemament extern d'usuari"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Permet als usuaris muntar els dispositius externs següents"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificats SSL root"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importa certificat root"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index be843190732..7b5a5cd549f 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -66,23 +66,23 @@ msgstr "Imatge no vàlida"
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP està desactivada."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -268,19 +268,19 @@ msgstr "Establiu un nom d'usuari per l'administrador."
 msgid "Set an admin password."
 msgstr "Establiu una contrasenya per l'administrador."
 
-#: private/setup.php:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ha compartit »%s« amb tu"
@@ -337,3 +337,21 @@ msgstr "l'any passat"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "anys enrere"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Heu de facilitar un nom d'usuari vàlid"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Heu de facilitar una contrasenya vàlida"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "El nom d'usuari ja està en ús"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index caae9ab09e8..ec8cf451845 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # 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: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 09:10+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -49,15 +50,15 @@ msgstr "El correu electrónic s'ha enviat"
 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:282
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Mode d'enviament"
 
-#: admin/controller.php:118 templates/admin.php:295 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Xifrat"
 
-#: admin/controller.php:120 templates/admin.php:319
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Mètode d'autenticació"
 
@@ -66,7 +67,7 @@ msgid "Unable to load list from App Store"
 msgstr "No s'ha pogut carregar la llista des de l'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 "Error d'autenticació"
 
@@ -128,32 +129,32 @@ msgstr "No es pot eliminar l'usuari del grup %s"
 msgid "Couldn't update app."
 msgstr "No s'ha pogut actualitzar l'aplicació."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Contrasenya incorrecta"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "No heu proporcionat cap usuari"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar."
 
-#: 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 "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "No es pot canviar la contrasenya"
 
@@ -205,7 +206,7 @@ msgstr "Error en actualitzar l'aplicació"
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Actualitza"
 
@@ -213,31 +214,31 @@ msgstr "Actualitza"
 msgid "Updated"
 msgstr "Actualitzada"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Seleccioneu una imatge de perfil"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Contrasenya massa feble"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Contrasenya feble"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "Contrasenya passable"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Contrasenya bona"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Contrasenya forta"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona."
 
@@ -286,7 +287,7 @@ msgstr "Heu de facilitar una contrasenya vàlida"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Català"
 
@@ -429,157 +430,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartir"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Habilita l'API de compartir"
 
-#: templates/admin.php:195
+#: 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:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permet enllaços"
 
-#: templates/admin.php:203
+#: 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:210
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permet pujada pública"
 
-#: templates/admin.php:211
+#: 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:218
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:219
+#: 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:226
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permet compartir amb qualsevol"
 
-#: templates/admin.php:229
+#: 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:236
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permet notificacions per correu electrónic"
 
-#: templates/admin.php:237
+#: 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:244
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:257
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Força HTTPS"
 
-#: templates/admin.php:259
+#: 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:265
+#: 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:277
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Servidor de correu"
 
-#: templates/admin.php:279
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "S'usa per enviar notificacions."
 
-#: templates/admin.php:310
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Des de l'adreça"
 
-#: templates/admin.php:332
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Es requereix autenticació"
 
-#: templates/admin.php:336
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adreça del servidor"
 
-#: templates/admin.php:340
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:345
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Credencials"
 
-#: templates/admin.php:346
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Nom d'usuari SMTP"
 
-#: templates/admin.php:349
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Contrasenya SMTP"
 
-#: templates/admin.php:353
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Prova l'arranjament del correu"
 
-#: templates/admin.php:354
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Envia correu"
 
-#: templates/admin.php:359
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:360
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:392
+#: templates/admin.php:409
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:393
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:399 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:403 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +614,23 @@ msgstr "Afegiu la vostra aplicació"
 msgid "More Apps"
 msgstr "Més aplicacions"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Seleccioneu una aplicació"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentació:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Mostra la web de l'aplicació"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>"
 
@@ -650,108 +667,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "La seva contrasenya s'ha canviat"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Foto de perfil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Puja'n una de nova"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Selecciona'n una de nova dels fitxers"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Elimina imatge"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "El vostre compte original proporciona l'avatar."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Selecciona com a imatge de perfil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducció"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Contrasenya d'accés"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Desencripta tots els fitxers"
 
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index ce1cd4df022..30ed5e7f450 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/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: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 08:52+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -422,41 +422,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atributs especials"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Camp de quota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Quota per defecte"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Camp de correu electrònic"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Norma per anomenar la carpeta arrel d'usuari"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nom d'usuari intern"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -472,15 +483,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atribut nom d'usuari intern:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Sobrescriu la detecció UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Atribut UUID per Usuaris:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Atribut UUID per Grups:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -517,10 +528,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 08ca5c28cfc..b57e1632d7e 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 21:30+0000\n"
-"Last-Translator: m23 <black23@gmail.com>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,36 +25,27 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Datum expirace je v minulosti."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, 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"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Zapnut režim údržby"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Vypnut režim údržby"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -151,67 +142,67 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Prosinec"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Ukládám..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:996
+#: js/js.js:1125
 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:997
+#: js/js.js:1126
 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:998
+#: js/js.js:1127
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:1000
+#: js/js.js:1129
 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:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: js/js.js:1002
+#: js/js.js:1131
 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:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "před měsíci"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "před lety"
 
@@ -251,32 +242,40 @@ msgid "One file conflict"
 msgstr "Jeden konflikt souboru"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nové soubory"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Které soubory chcete ponechat?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Pokračovat"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(vybráno vše)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "(vybráno {count})"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Chyba při nahrávání šablony existence souboru"
 
@@ -309,11 +308,11 @@ msgid "Share"
 msgstr "Sdílet"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Chyba"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Chyba při sdílení"
 
@@ -429,19 +428,19 @@ msgstr "Chráněno heslem"
 msgid "Error unsetting expiration date"
 msgstr "Chyba při odstraňování data vypršení platnosti"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Chyba při nastavení data vypršení platnosti"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Odesílám ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail odeslán"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Varování"
 
@@ -497,7 +496,7 @@ msgstr "reset hesla %s"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+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}"
@@ -555,6 +554,18 @@ msgstr "Nové heslo"
 msgid "Reset password"
 msgstr "Obnovit heslo"
 
+#: 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 není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!"
+
+#: setup/controller.php:144
+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í"
@@ -776,7 +787,7 @@ msgstr "Alternativní přihlášení"
 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 ""
+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 fbe509b5e99..b50ebe55d7e 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 20:40+0000\n"
-"Last-Translator: m23 <black23@gmail.com>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,48 +25,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" je neplatným názvem souboru."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Neplatný zdroj"
 
-#: ajax/newfile.php:101
+#: 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."
@@ -76,74 +76,74 @@ msgstr "Server není oprávněn otevírat adresy URL. Ověřte, prosím, konfigu
 msgid "Error while downloading %s to %s"
 msgstr "Chyba při stahování %s do %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Chyba při vytváření složky"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Nelze nastavit adresář pro nahrané soubory."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Neplatný token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Žádný soubor nebyl odeslán. Neznámá chyba"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Soubor byl odeslán úspěšně"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Soubor byl odeslán pouze částečně"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl odeslán"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Chybí adresář pro dočasné soubory"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Zápis na disk selhal"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nedostatek dostupného úložného prostoru"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Nahrávání selhalo. Nepodařilo se získat informace o souboru."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
@@ -164,94 +164,94 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL nemůže zůstat prázdná"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "V osobní složce je název 'Shared' rezervovaný"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Nepodařilo se vytvořit soubor"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Nepodařilo se vytvořit složku"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Chyba při načítání URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Chyba při přesunu souboru"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Chyba"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Nevyřízené"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Nepodařilo se přejmenovat soubor"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "nahrazeno {new_name} s {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "vrátit zpět"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Chyba při mazání souboru."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n soubor"
 msgstr[1] "%n soubory"
 msgstr[2] "%n souborů"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} a {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávám %n soubor"
@@ -289,29 +289,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Chyba při přesunu souboru"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Chyba"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Upraveno"
 
@@ -319,113 +311,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nemůže být přejmenován"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Odeslat"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Zacházení se soubory"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximální velikost pro odesílání"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "největší možná: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Potřebné pro více-souborové stahování a stahování složek."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Povolit ZIP-stahování"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 znamená bez omezení"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maximální velikost vstupu pro ZIP soubory"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Uložit"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nový"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nový textový soubor"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Textový soubor"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nová složka"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Složka"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Odstraněné soubory"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Nahrajte něco."
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Odesílaný soubor je příliš velký"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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 48ef3fef556..27f50770daf 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -7,15 +7,15 @@
 # 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: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-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"
@@ -107,7 +107,7 @@ msgstr "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počk
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+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 349b37ace76..05a39f7eb80 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # m23 <black23@gmail.com>, 2014
-# pstast <petr@stastny.eu>, 2013
+# pstast <petr@stastny.eu>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 21:30+0000\n"
-"Last-Translator: m23 <black23@gmail.com>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"Last-Translator: I Robot\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"
@@ -39,91 +39,100 @@ msgstr "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbo
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba při nastavení úložiště Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Uloženo"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Varování:</b> 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Externí úložiště"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Název složky"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Externí úložiště"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Přístupný pro"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Přidat úložiště"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nenastaveno"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Všichni uživatelé"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Uživatelé"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Zapnout externí uživatelské úložiště"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr "Povolit uživatelů připojit externí úložiště"
+msgstr "Povolit uživatelů připojit následující externí úložiště"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Kořenové certifikáty SSL"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 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 ce64f200f2f..4b4b4e76aa6 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -5,14 +5,14 @@
 # Translators:
 # liska_, 2013
 # m23 <black23@gmail.com>, 2014
-# pstast <petr@stastny.eu>, 2013
+# pstast <petr@stastny.eu>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 12:24+0000\n"
-"Last-Translator: m23 <black23@gmail.com>\n"
+"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"
@@ -63,7 +63,7 @@ msgstr "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.
 #: templates/public.php:17
 #, php-format
 msgid "shared by %s"
-msgstr "sdíleno %s"
+msgstr "sdílí %s"
 
 #: templates/public.php:44
 #, php-format
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 88c09e4d702..cebf39ff8de 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: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-15 05:40+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-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"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 7d2e44fc8d4..92e8e85cb40 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -6,15 +6,15 @@
 # Honza K. <honza889@gmail.com>, 2013
 # liska_, 2013
 # m23 <black23@gmail.com>, 2014
-# 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: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 21:30+0000\n"
-"Last-Translator: m23 <black23@gmail.com>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: I Robot\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"
@@ -70,23 +70,23 @@ msgstr "Chybný obrázek"
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Stahování v ZIPu je vypnuto."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musí být stahovány jednotlivě."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Zpět k souborům"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Vybrané soubory jsou příliš velké pro vytvoření ZIP souboru."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -236,7 +236,7 @@ msgstr "MySQL/MariaDB uživatel '%s'@'localhost' již existuje."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr "Zahodit uživatele z MySQL/MariaDB"
+msgstr "Smazat tohoto uživatele z MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
@@ -245,7 +245,7 @@ msgstr "MySQL/MariaDB uživatel '%s'@'%%' již existuje"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr "Zahodit uživatele z MySQL/MariaDB."
+msgstr "Smazat tohoto uživatele z MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -272,19 +272,19 @@ msgstr "Zadejte uživatelské jméno správce."
 msgid "Set an admin password."
 msgstr "Zadejte heslo správce."
 
-#: private/setup.php:198
+#: 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:199
+#: 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s s vámi sdílí »%s«"
@@ -345,3 +345,21 @@ msgstr "minulý rok"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "před lety"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Musíte zadat platné uživatelské jméno"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Musíte zadat platné heslo"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Uživatelské jméno je již využíváno"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 459232cb5a8..b9a259d6d43 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 21:40+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06: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"
@@ -27,7 +27,7 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Uvedena nesprávná hodnota pro %s"
 
 #: admin/controller.php:73
 msgid "Saved"
@@ -35,16 +35,16 @@ msgstr "Uloženo"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "otestovat nastavení e-mailu"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+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 ""
+msgstr "Při odesílání e-mailu nastala chyba. Překontrolujte vaše nastavení."
 
 #: admin/controller.php:99
 msgid "Email sent"
@@ -52,26 +52,26 @@ 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 ""
+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:282
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
-msgstr ""
+msgstr "Mód odesílání"
 
-#: admin/controller.php:118 templates/admin.php:295 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: admin/controller.php:120 templates/admin.php:319
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
-msgstr "Metoda autentifikace"
+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"
 
 #: 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 "Chyba přihlášení"
 
@@ -133,32 +133,32 @@ msgstr "Nelze odebrat uživatele ze skupiny %s"
 msgid "Couldn't update app."
 msgstr "Nelze aktualizovat aplikaci."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Nesprávné heslo"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Nebyl uveden uživatel"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu."
 
-#: 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 "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Změna hesla se nezdařila"
 
@@ -210,7 +210,7 @@ msgstr "Chyba při aktualizaci aplikace"
 msgid "Error"
 msgstr "Chyba"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Aktualizovat"
 
@@ -218,31 +218,31 @@ msgstr "Aktualizovat"
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Vyberte profilový obrázek"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Velmi slabé heslo"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Slabé heslo"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "Středně silné heslo"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Dobré heslo"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Silné heslo"
 
-#: js/personal.js:316
+#: js/personal.js:313
 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."
 
@@ -291,7 +291,7 @@ msgstr "Musíte zadat platné heslo"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Varování: Osobní složka uživatele \"{user}\" již existuje."
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Česky"
 
@@ -325,11 +325,11 @@ msgstr "Přihlásit"
 
 #: templates/admin.php:18
 msgid "Plain"
-msgstr ""
+msgstr "Čistý text"
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "Správce NT LAN"
 
 #: templates/admin.php:24
 msgid "SSL"
@@ -434,157 +434,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Sdílení"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Povolit API sdílení"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Povolit aplikacím používat API sdílení"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Povolit odkazy"
 
-#: templates/admin.php:203
+#: 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:210
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Povolit veřejné nahrávání souborů"
 
-#: templates/admin.php:211
+#: 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:218
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Povolit znovu-sdílení"
 
-#: templates/admin.php:219
+#: 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:226
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Povolit uživatelům sdílet s kýmkoliv"
 
-#: templates/admin.php:229
+#: 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:236
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Povolit e-mailová upozornění"
 
-#: templates/admin.php:237
+#: 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:244
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: templates/admin.php:257
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:259
+#: 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:265
+#: 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:277
+#: templates/admin.php:294
 msgid "Email Server"
-msgstr "Emailový server"
+msgstr "E-mailový server"
 
-#: templates/admin.php:279
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
-msgstr "Toto se používá při odesílání upozornění."
+msgstr "Toto se používá pro odesílání upozornění."
 
-#: templates/admin.php:310
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Adresa odesílatele"
 
-#: templates/admin.php:332
+#: templates/admin.php:349
 msgid "Authentication required"
-msgstr "Ověření vyžadováno"
+msgstr "Vyžadováno ověření"
 
-#: templates/admin.php:336
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adresa serveru"
 
-#: templates/admin.php:340
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:345
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Přihlašovací údaje"
 
-#: templates/admin.php:346
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP uživatelské jméno "
 
-#: templates/admin.php:349
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP heslo"
 
-#: templates/admin.php:353
+#: templates/admin.php:370
 msgid "Test email settings"
-msgstr "Nastavení zkušebního emailu"
+msgstr "Otestovat nastavení e-mailu"
 
-#: templates/admin.php:354
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Odeslat e-mail"
 
-#: templates/admin.php:359
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:360
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Úroveň zaznamenávání"
 
-#: templates/admin.php:392
+#: templates/admin.php:409
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:393
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:399 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:403 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -602,23 +618,23 @@ msgstr "Přidat Vaši aplikaci"
 msgid "More Apps"
 msgstr "Více aplikací"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Dokumentace:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Prohlédněte si webovou stránku aplikace"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>"
 
@@ -655,108 +671,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Vaše heslo bylo změněno"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Změna vašeho hesla se nezdařila"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Současné heslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Celé jméno"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Vaše e-mailová adresa"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
-msgstr ""
+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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilový obrázek"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Nahrát nový"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Vyberte nový ze souborů"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Odebrat obrázek"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Váš avatar je poskytován Vaším původním účtem."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Vybrat jako profilový obrázek"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Pomoci s překladem"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Přihlašovací heslo"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Odšifrovat všechny soubory"
 
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 37b925a6984..c2845ec7a58 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -171,7 +171,7 @@ msgstr "Nápověda"
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
 msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+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
@@ -207,7 +207,7 @@ msgstr "nalezené skupiny"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Uživatelé se přihlašují s tímto atributem:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -275,7 +275,7 @@ 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 %s access to users meeting these criteria:"
-msgstr ""
+msgstr "Omezit přístup %s uživatelům splňujícím tyto podmínky:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -419,49 +419,60 @@ msgstr "Asociace člena skupiny"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+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:40
+msgid "Paging chunksize"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Speciální atributy"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Pole pro kvótu"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Výchozí kvóta"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "v bajtech"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Pole e-mailu"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pojmenování domovské složky uživatele"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Interní uživatelské jméno"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -477,15 +488,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atribut interního uživatelského jména:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Nastavit ručně UUID atribut"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -496,19 +507,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID atribut pro uživatele:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID atribut pro skupiny:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Mapování uživatelských jmen z LDAPu"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -522,10 +533,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Zrušit mapování uživatelských jmen LDAPu"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 c42c13e5a28..2e8afc0dbc8 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,19 +135,19 @@ msgstr "Tachwedd"
 msgid "December"
 msgstr "Rhagfyr"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Yn cadw..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -164,7 +155,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -172,15 +163,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -188,11 +179,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -200,15 +191,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "misoedd yn ôl"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
@@ -249,32 +240,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -307,11 +306,11 @@ msgid "Share"
 msgstr "Rhannu"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Gwall"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Gwall wrth rannu"
 
@@ -427,19 +426,19 @@ msgstr "Diogelwyd â chyfrinair"
 msgid "Error unsetting expiration date"
 msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Gwall wrth osod dyddiad dod i ben"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Yn anfon ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Anfonwyd yr e-bost"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Rhybudd"
 
@@ -553,6 +552,18 @@ msgstr "Cyfrinair newydd"
 msgid "Reset password"
 msgstr "Ailosod cyfrinair"
 
+#: 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 "Personol"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 2ba7de4a3ca..c030e6e2758 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +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/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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ni lwythwyd ffeil i fyny. Gwall anhysbys."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dim ond yn rhannol y llwythwyd y ffeil i fyny"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ni lwythwyd ffeil i fyny"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Plygell dros dro yn eisiau"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Methwyd ysgrifennu i'r ddisg"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Dim digon o le storio ar gael"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Cyfeiriadur annilys."
 
@@ -156,76 +156,76 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Diddymwyd llwytho i fyny."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} yn bodoli'n barod"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Dileu'n barhaol"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Gwall"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "I ddod"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "newidiwyd {new_name} yn lle {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "dadwneud"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -233,7 +233,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -241,11 +241,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -284,29 +284,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr ""
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Gwall"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Maint"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Addaswyd"
 
@@ -314,113 +306,109 @@ msgstr "Addaswyd"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Llwytho i fyny"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Trafod ffeiliau"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maint mwyaf llwytho i fyny"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "mwyaf. posib:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Angen ar gyfer llwytho mwy nag un ffeil neu blygell i lawr yr un pryd."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Galluogi llwytho i lawr ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 yn ddiderfyn"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Cadw"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Newydd"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Ffeil destun"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Plygell"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Dolen o"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Ffeiliau ddilewyd"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Diddymu llwytho i fyny"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Dileu"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Maint llwytho i fyny'n rhy fawr"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/cy_GB/files_external.po
index 91af8d75305..855d4d6f82b 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Dileu"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 60f778e3128..f58729ece0b 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "gwasanaethau gwe a reolir gennych"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Mae llwytho ZIP wedi ei ddiffodd."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Nôl i Ffeiliau"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Enw a/neu gyfrinair MS SQL annilys: %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 "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr."
 
@@ -206,9 +206,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 "Gwall DB: \"%s\""
@@ -217,9 +217,9 @@ msgstr "Gwall 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 "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
@@ -255,7 +255,7 @@ msgstr "Enw a/neu gyfrinair Oracle annilys"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %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 "Enw a/neu gyfrinair PostgreSQL annilys"
 
@@ -267,19 +267,19 @@ msgstr "Creu enw defnyddiwr i'r gweinyddwr."
 msgid "Set an admin password."
 msgstr "Gosod cyfrinair y gweinyddwr."
 
-#: private/setup.php:198
+#: 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 "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -344,3 +344,21 @@ msgstr "y llynedd"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 70953b5b176..d9646c0cc2e 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr "Anfonwyd yr e-bost"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "Amgryptiad"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index d0c43b131c4..e7a8c333fd3 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -423,41 +423,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -473,15 +484,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -518,10 +529,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 9246aa2a275..6a57c445c88 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,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -24,36 +24,27 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kunne ikke sende mail til følgende brugere: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Startede vedligeholdelsestilstand"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "standsede vedligeholdelsestilstand"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -150,63 +141,63 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dage siden"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n måned siden"
 msgstr[1] "%n måneder siden"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "år siden"
 
@@ -245,54 +236,62 @@ msgid "One file conflict"
 msgstr "En filkonflikt"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nye filer"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Hvilke filer ønsker du at beholde?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Annuller"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Videre"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(alle valgt)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} valgt)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Fejl ved inlæsning af; fil eksistere skabelon"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Meget svagt kodeord"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Svagt kodeord"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Jævnt kodeord"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Godt kodeord"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Stærkt kodeord"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -303,11 +302,11 @@ msgid "Share"
 msgstr "Del"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fejl"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
@@ -423,19 +422,19 @@ msgstr "Beskyttet med adgangskode"
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udløbsdato"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fejl under sætning af udløbsdato"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -491,7 +490,7 @@ msgstr "%s adgangskode nulstillet"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+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}"
@@ -549,6 +548,18 @@ msgstr "Nyt kodeord"
 msgid "Reset password"
 msgstr "Nulstil kodeord"
 
+#: 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 "Personligt"
@@ -669,7 +680,7 @@ msgstr "Opret en <strong>administratorkonto</strong>"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Lager & database"
 
 #: templates/installation.php:77
 msgid "Data folder"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 22b927a5d7b..e997c9ee8e2 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,16 +3,17 @@
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -21,48 +22,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Filnavnet kan ikke stå tomt."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" er et ugyldigt filnavn."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Mappen er blevet slettet eller fjernet."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Ikke en gyldig kilde"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -72,74 +73,74 @@ msgstr "Server har ikke tilladelse til at åbne URL'er. Kontroller venligst serv
 msgid "Error while downloading %s to %s"
 msgstr "Fejl ved hentning af %s til %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fejl ved oprettelse af mappen"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Ude af stand til at vælge upload mappe."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Ugyldig Token "
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen blev kun delvist uploadet."
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ingen fil uploadet"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Manglende midlertidig mappe."
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Fejl ved skrivning til disk."
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Der er ikke nok plads til rådlighed"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload fejlede. Kunne ikke finde den uploadede fil."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Upload fejlede. Kunne ikke hente filinformation."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -153,99 +154,99 @@ msgstr "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 by
 
 #: js/file-upload.js:258
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}"
 
 #: js/file-upload.js:268
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage"
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Kunne ikke hente resultat fra server."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL kan ikke være tom"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Navnet 'Shared' er reserveret i hjemmemappen."
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Kunne ikke oprette fil"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Kunne ikke oprette mappe"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Fejl ved URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Fejl ved flytning af fil"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Fejl"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Kunne ikke omdøbe filen"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "erstattede {new_name} med {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "fortryd"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Fejl ved sletnign af fil."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} og {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploader %n fil"
@@ -253,7 +254,7 @@ msgstr[1] "Uploader %n filer"
 
 #: js/files.js:96
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "'{name}' er et ugyldigt filnavn."
 
 #: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
@@ -282,29 +283,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Fejl ved flytning af fil"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Fejl"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Ændret"
 
@@ -312,113 +305,109 @@ msgstr "Ændret"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Ugyldig mappenavn. 'Shared' er reserveret."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kunne ikke omdøbes"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Filhåndtering"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimal upload-størrelse"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. mulige: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Nødvendigt for at kunne downloade mapper og flere filer ad gangen."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Tillad ZIP-download"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 er ubegrænset"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimal størrelse på ZIP filer"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Gem"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Ny tekstfil"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Ny Mappe"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Slettede filer"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Upload er for stor"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Indlæser"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Opgraderer filsystems cachen..."
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index d3ae79673e7..4a0d6ece905 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -3,12 +3,13 @@
 # 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: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 05:55+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"
@@ -37,91 +38,100 @@ msgstr "Angiv venligst en valid Dropbox app nøgle og hemmelighed"
 msgid "Error configuring Google Drive storage"
 msgstr "Fejl ved konfiguration af Google Drive plads"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
+msgstr "Gemt"
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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. "
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Ekstern opbevaring"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Mappenavn"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Eksternt lager"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Opsætning"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Valgmuligheder"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Kan anvendes"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Tilføj lager"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ingen sat"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Alle brugere"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Brugere"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Aktiver ekstern opbevaring for brugere"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Tillad brugere at montere følgende som eksternt lager"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL-rodcertifikater"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importer rodcertifikat"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 784b4385ff3..a1f254615ef 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-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"
@@ -67,7 +68,7 @@ msgstr "delt af %s"
 #: templates/public.php:44
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Download %s"
 
 #: templates/public.php:48
 msgid "Direct link"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 0c41528bd31..6bef7060df0 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,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -69,23 +69,23 @@ msgstr "Ugyldigt billede"
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP-download er slået fra."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -161,7 +161,7 @@ msgstr "Adgang er udløbet. Genindlæs siden."
 
 #: private/json.php:75
 msgid "Unknown user"
-msgstr ""
+msgstr "Ukendt bruger"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -196,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/MariaDB username and/or password not valid"
-msgstr ""
+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\""
@@ -221,9 +221,9 @@ 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\""
@@ -231,20 +231,20 @@ msgstr "Fejlende kommando var: \"%s\""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL/MariaDB bruger '%s'@'localhost' eksistere allerede."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Slet denne bruger fra MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB bruger '%s'@'%%' eksistere allerede"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Drop denne bruger fra MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -259,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."
 
@@ -271,19 +271,19 @@ msgstr "Angiv et admin brugernavn."
 msgid "Set an admin password."
 msgstr "Angiv et admin kodeord."
 
-#: private/setup.php:198
+#: 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:199
+#: 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s delte »%s« med sig"
@@ -340,3 +340,21 @@ msgstr "sidste år"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "år siden"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Et gyldigt brugernavn skal angives"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "En gyldig adgangskode skal angives"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index f4c3d5df08c..2841b8d5188 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -28,11 +28,11 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Gemt"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "test email indstillinger"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
@@ -51,15 +51,15 @@ msgstr "E-mail afsendt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -68,7 +68,7 @@ msgid "Unable to load list from App Store"
 msgstr "Kunne ikke indlæse listen fra 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 "Adgangsfejl"
 
@@ -130,38 +130,38 @@ msgstr "Brugeren kan ikke fjernes fra gruppen %s"
 msgid "Couldn't update app."
 msgstr "Kunne ikke opdatere app'en."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Forkert kodeord"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Intet brugernavn givet"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen."
 
-#: 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 "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Kunne ikke ændre kodeord"
 
 #: js/admin.js:73
 msgid "Sending..."
-msgstr ""
+msgstr "Sender..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -169,7 +169,7 @@ msgstr "Brugerdokumentation"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Administrator Dokumentation"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -207,7 +207,7 @@ msgstr "Der opstod en fejl under app opgraderingen"
 msgid "Error"
 msgstr "Fejl"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Opdater"
 
@@ -215,31 +215,31 @@ msgstr "Opdater"
 msgid "Updated"
 msgstr "Opdateret"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Vælg et profilbillede"
 
 #: js/personal.js:274
 msgid "Very weak password"
-msgstr ""
+msgstr "Meget svagt kodeord"
 
 #: js/personal.js:275
 msgid "Weak password"
-msgstr ""
+msgstr "Svagt kodeord"
 
 #: js/personal.js:276
 msgid "So-so password"
-msgstr ""
+msgstr "Jævnt kodeord"
 
 #: js/personal.js:277
 msgid "Good password"
-msgstr ""
+msgstr "Godt kodeord"
 
 #: js/personal.js:278
 msgid "Strong password"
-msgstr ""
+msgstr "Stærkt kodeord"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. "
 
@@ -288,7 +288,7 @@ msgstr "En gyldig adgangskode skal angives"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Dansk"
 
@@ -326,28 +326,28 @@ msgstr ""
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "NT LAN Manager"
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sikkerhedsadvarsel"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -356,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Opsætnings Advarsel"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' mangler"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Din PHP-version er forældet"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Landestandard fungerer ikke"
 
-#: templates/admin.php:119
+#: 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:123
+#: 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:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s."
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internetforbindelse fungerer ikke"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -426,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktiver Share API"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Tillad apps til at bruge Share API"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Tillad links"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Tillad offentlig upload"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Tillad videredeling"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Tillad brugere at dele med alle"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Tillad mail underretninger"
 
-#: templates/admin.php:235
+#: 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:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Gennemtving HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
-msgstr ""
+msgstr "Email Server"
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
-msgstr ""
+msgstr "Fra adresse"
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
-msgstr ""
+msgstr "Godkendelse påkrævet"
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Serveradresse"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
-msgstr ""
+msgstr "Brugeroplysninger"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP Brugernavn"
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP Kodeord"
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
-msgstr ""
+msgstr "Test email indstillinger"
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
-msgstr ""
+msgstr "Send email"
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -599,23 +615,23 @@ msgstr "Tilføj din App"
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Vælg en App"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "Dokumentation:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikationens side på apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>"
 
@@ -652,108 +668,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Din adgangskode blev ændret"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Ude af stand til at ændre dit kodeord"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nyt kodeord"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilbillede"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Upload nyt"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Vælg nyt fra Filer"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Fjern billede"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Din avatar kommer fra din oprindelige konto."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Annuller"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Vælg som profilbillede"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Log-in kodeord"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle Filer "
 
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 67ac87e3643..d97bda300db 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -420,41 +420,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kvote Felt"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Email Felt"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Internt Brugernavn"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 626c6d00ec8..31ff35c916b 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -5,8 +5,9 @@
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
 # I Robot, 2013
+# I Robot, 2014
 # Marcel Kühlhorn <tux93@opensuse.org>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 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
@@ -17,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 11:00+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 08:50+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"
@@ -27,36 +28,27 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Ablaufdatum liegt in der Vergangenheit."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Wartungsmodus eingeschaltet"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Wartungsmodus ausgeschaltet"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -153,127 +145,135 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:995
+#: js/js.js:1099
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:996
+#: js/js.js:1100
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:997
+#: js/js.js:1101
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:998
+#: js/js.js:1102
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:999
+#: js/js.js:1103
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1000
+#: js/js.js:1104
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1001
+#: js/js.js:1105
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1002
+#: js/js.js:1106
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1003
+#: js/js.js:1107
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:1004
+#: js/js.js:1108
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1005
+#: js/js.js:1109
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:125
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:146
+#: js/oc-dialogs.js:151
 msgid "Error loading file picker template: {error}"
 msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:177
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:182
+#: js/oc-dialogs.js:187
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:199
+#: js/oc-dialogs.js:204
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:219
+#: js/oc-dialogs.js:224
 msgid "Error loading message template: {error}"
 msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
 
-#: js/oc-dialogs.js:347
+#: js/oc-dialogs.js:352
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} Dateikonflikt"
 msgstr[1] "{count} Dateikonflikte"
 
-#: js/oc-dialogs.js:361
+#: js/oc-dialogs.js:366
 msgid "One file conflict"
 msgstr "Ein Dateikonflikt"
 
-#: js/oc-dialogs.js:367
+#: js/oc-dialogs.js:372
+msgid "New Files"
+msgstr "Neue Dateien"
+
+#: js/oc-dialogs.js:373
+msgid "Already existing files"
+msgstr "Die Dateien existieren bereits"
+
+#: js/oc-dialogs.js:375
 msgid "Which files do you want to keep?"
 msgstr "Welche Dateien möchtest Du behalten?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:376
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:384
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:394
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
 msgid "(all selected)"
 msgstr "(Alle ausgewählt)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:457
 msgid "({count} selected)"
 msgstr "({count} ausgewählt)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:465
 msgid "Error loading file exists template"
 msgstr "Fehler beim Laden der vorhanden Dateivorlage"
 
@@ -306,11 +306,11 @@ msgid "Share"
 msgstr "Teilen"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -426,19 +426,19 @@ msgstr "Durch ein Passwort geschützt"
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warnung"
 
@@ -552,6 +552,18 @@ msgstr "Neues Passwort"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
+#: 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 OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!"
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 6b3c99980c8..d27a99c98fc 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 21:40+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -25,48 +25,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" ist kein gültiger Dateiname."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
 msgstr "Der Zielordner wurde verschoben oder gelöscht."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Keine gültige Quelle"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -76,74 +76,74 @@ msgstr "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfi
 msgid "Error while downloading %s to %s"
 msgstr "Fehler beim Herunterladen von %s nach %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fehler beim Erstellen des Ordners"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Ungültiges Merkmal"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei konnte nur teilweise übertragen werden"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -164,92 +164,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "Die URL darf nicht leer sein"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Das Benutzerverzeichnis 'Shared' ist ein reservierter Dateiname"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Die Datei konnte nicht erstellt werden"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Der Ordner konnte nicht erstellt werden"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Fehler beim Abrufen der URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Fehler beim Verschieben der Datei"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Fehler"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Die Datei konnte nicht umbenannt werden"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name} ersetzt durch {new_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "rückgängig machen"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Fehler beim Löschen der Datei."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} und {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
@@ -286,29 +286,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Fehler beim Verschieben der Datei"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Fehler"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Geändert"
 
@@ -316,113 +308,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Dateibehandlung"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximale Upload-Größe"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maximal möglich:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Für Mehrfachdatei- und Ordnerdownloads benötigt:"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP-Download aktivieren"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 bedeutet unbegrenzt"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale Größe für ZIP-Dateien"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Neue Textdatei"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Scanne"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 68b7ecc4b26..895dc57a819 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2014
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 11:00+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 19:00+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"
@@ -39,91 +40,100 @@ msgstr "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Hinweis:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr "und"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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. "
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Ordnername"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Optionen"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Zutreffend"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Verfügbar für"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Speicher hinzufügen"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nicht definiert"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Kein Nutzer oder Gruppe"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Alle Benutzer"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 70f1e16ede0..1c19e3ca284 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# I Robot, 2014
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 11:00+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 08:50+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"
@@ -70,23 +71,23 @@ msgstr "Ungültiges Bild"
 msgid "web services under your control"
 msgstr "Web-Services unter Deiner Kontrolle"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -197,8 +198,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Password ungültig: %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 musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
@@ -211,9 +212,9 @@ msgstr "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig"
 #: 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 Fehler: \"%s\""
@@ -222,9 +223,9 @@ msgstr "DB Fehler: \"%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 "Fehlerhafter Befehl war: \"%s\""
@@ -260,7 +261,7 @@ msgstr "Oracle Benutzername und/oder Passwort ungültig"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %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 Benutzername und/oder Passwort ungültig"
 
@@ -272,19 +273,19 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:198
+#: 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 "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s teilte »%s« mit Dir"
@@ -341,3 +342,21 @@ msgstr "Letztes Jahr"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "Vor Jahren"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Folgende Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\" und \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Es muss ein gültiger Benutzername angegeben werden"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Es muss ein gültiges Passwort angegeben werden"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Dieser Benutzername existiert bereits"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 64f6540e12b..bee681657b5 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -4,20 +4,21 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 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
+# kabum <uu.kabum@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 11:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: kabum <uu.kabum@gmail.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"
@@ -55,15 +56,15 @@ msgstr "E-Mail wurde verschickt"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Sende-Modus"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Authentifizierungsmethode"
 
@@ -72,7 +73,7 @@ msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:55
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
 msgstr "Fehler bei der Anmeldung"
 
@@ -134,32 +135,32 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 msgid "Couldn't update app."
 msgstr "Die App konnte nicht aktualisiert werden."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Keinen Benutzer übermittelt"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut."
 
-#: 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 "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Passwort konnte nicht geändert werden"
 
@@ -211,7 +212,7 @@ msgstr "Fehler beim Aktualisieren der App"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Aktualisierung durchführen"
 
@@ -219,7 +220,7 @@ msgstr "Aktualisierung durchführen"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Wähle ein Profilbild"
 
@@ -243,7 +244,7 @@ msgstr "Gutes Passwort"
 msgid "Strong password"
 msgstr "Starkes Passwort"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen."
 
@@ -292,7 +293,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Deutsch (Persönlich)"
 
@@ -349,7 +350,7 @@ msgstr "Sicherheitswarnung"
 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."
+msgstr "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird."
 
 #: templates/admin.php:64
 msgid ""
@@ -435,157 +436,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktiviere Sharing-API"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Erlaubt Apps die Nutzung der Share-API"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Erlaubt Links"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: templates/admin.php:212
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen"
 
-#: templates/admin.php:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Erlaubt erneutes Teilen"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Mail-Benachrichtigung erlauben"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Erzwinge HTTPS"
 
-#: templates/admin.php:261
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen."
 
-#: templates/admin.php:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "E-Mail-Server"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Dies wird zum Senden von Benachrichtigungen verwendet."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Absender-Adresse"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Authentifizierung benötigt"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Zugangsdaten"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP Benutzername"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP Passwor"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Teste E-Mail-Einstellunge"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Sende E-Mail"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -603,23 +620,23 @@ msgstr "Füge Deine Anwendung hinzu"
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Wähle eine Anwendung aus"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Dokumentation:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen findest Du auf apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Siehe Anwendungs-Website"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
@@ -654,110 +671,110 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Dein Passwort wurde geändert."
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilbild"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Neues hochladen"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Neues aus den Dateien wählen"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Bild entfernen"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Dein Avatar wird von Deinem ursprünglichenKonto verwendet."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Als Profilbild wählen"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Hilf bei der Übersetzung"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index b41d11b2bd9..527d5f8dce6 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:11+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 18:40+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"
@@ -148,7 +148,7 @@ msgstr[1] "%s Benutzer gefunden"
 msgid "Invalid Host"
 msgstr "Ungültiger Host"
 
-#: lib/wizard.php:963
+#: lib/wizard.php:983
 msgid "Could not find the desired feature"
 msgstr "Konnte die gewünschte Funktion nicht finden"
 
@@ -423,41 +423,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Seitenstücke (Paging chunksize)"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kontingent Feld"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Standard Kontingent"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-Mail Feld"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -473,15 +484,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Attribut für interne Benutzernamen:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID-Attribute für Benutzer:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-Attribute für Gruppen:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -518,10 +529,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 7f1f1ea276d..9d060609c66 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,63 +135,63 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr "Freigeben"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -417,19 +416,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -543,6 +542,18 @@ 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 "Persönlich"
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index 6d6c99e34cc..4aad8f931dd 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Freigeben"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/de_AT/files_external.po b/l10n/de_AT/files_external.po
index 9f85e31f08f..f838de9ba61 100644
--- a/l10n/de_AT/files_external.po
+++ b/l10n/de_AT/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index 535f8b9b15d..bc182373dba 100644
--- a/l10n/de_AT/lib.po
+++ b/l10n/de_AT/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 3e57f3c3d97..567f670a464 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -212,31 +212,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 8fe6722c368..23ae3177db3 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index f8c3adfb6d6..a64e658ce1e 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -12,13 +12,13 @@
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -27,36 +27,27 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 "Wartungsmodus eingeschaltet"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Wartungsmodus ausgeschaltet"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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 ""
@@ -153,63 +144,63 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -248,32 +239,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Neue Dateien"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -306,11 +305,11 @@ msgid "Share"
 msgstr "Teilen"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -426,19 +425,19 @@ msgstr "Passwortgeschützt"
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warnung"
 
@@ -552,6 +551,18 @@ msgstr "Neues Passwort"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
+#: 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 "Persönlich"
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index a34437ec4d1..1a7d78b2479 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -11,13 +11,13 @@
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -26,48 +26,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -77,74 +77,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Ungültiges Merkmal"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei konnte nur teilweise übertragen werden"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -165,92 +165,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Fehler"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name} wurde ersetzt durch {new_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "rückgängig machen"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
@@ -287,29 +287,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr ""
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Fehler"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Grösse"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Geändert"
 
@@ -317,113 +309,109 @@ msgstr "Geändert"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Dateibehandlung"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximale Upload-Grösse"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maximal möglich:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Für Mehrfachdatei- und Ordnerdownloads benötigt:"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP-Download aktivieren"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 bedeutet unbegrenzt"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale Grösse für ZIP-Dateien"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Neues Verzeichnis"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Der Upload ist zu gross"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/de_CH/files_external.po
index 7d5e063fd8a..e1ca4b4cb2d 100644
--- a/l10n/de_CH/files_external.po
+++ b/l10n/de_CH/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Achtung:</b> Die Curl-Unterstützung  von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Ordnername"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Optionen"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Zutreffend"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Speicher hinzufügen"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nicht definiert"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Alle Benutzer"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index 0694cb86099..b39979b3657 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -6,13 +6,13 @@
 # FlorianScholz <work@bgstyle.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -69,23 +69,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu gross, um eine ZIP-Datei zu erstellen."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -196,8 +196,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Passwort ungültig: %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 "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
@@ -210,9 +210,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 "DB Fehler: \"%s\""
@@ -221,9 +221,9 @@ msgstr "DB Fehler: \"%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 "Fehlerhafter Befehl war: \"%s\""
@@ -259,7 +259,7 @@ msgstr "Oracle Benutzername und/oder Passwort ungültig"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %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 Benutzername und/oder Passwort ungültig"
 
@@ -271,19 +271,19 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:198
+#: 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 "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s teilt »%s« mit Ihnen"
@@ -340,3 +340,21 @@ msgstr "Letztes Jahr"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "Vor  Jahren"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Es muss ein gültiger Benutzername angegeben werden"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Es muss ein gültiges Passwort angegeben werden"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index c0a9698cd14..adc54611f07 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -11,13 +11,13 @@
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -56,15 +56,15 @@ msgstr "Email gesendet"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:55
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
 msgstr "Authentifizierungs-Fehler"
 
@@ -135,32 +135,32 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 msgid "Couldn't update app."
 msgstr "Die App konnte nicht aktualisiert werden."
 
-#: 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 ""
 
@@ -212,7 +212,7 @@ msgstr "Es ist ein Fehler während des Updates aufgetreten"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Update durchführen"
 
@@ -220,7 +220,7 @@ msgstr "Update durchführen"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
 
@@ -293,7 +293,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Deutsch (Schweiz)"
 
@@ -341,18 +341,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -361,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Einrichtungswarnung"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Das Modul 'fileinfo' fehlt"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Die Lokalisierung funktioniert nicht"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Keine Internetverbindung"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -431,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Share-API aktivieren"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Erlaube öffentliches hochladen"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -604,23 +620,23 @@ msgstr "Fügen Sie Ihre Anwendung hinzu"
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Wählen Sie eine Anwendung aus"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
@@ -657,108 +673,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Ihr Passwort wurde geändert."
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index c71f7f57765..2ae224c6325 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -10,13 +10,13 @@
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -427,41 +427,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kontingent-Feld"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Standard-Kontingent"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -477,15 +488,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Interne Eigenschaften des Benutzers:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -496,19 +507,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -522,10 +533,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 8c1f746839a..75bdf01c6a2 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -9,17 +9,17 @@
 # I Robot, 2014
 # lysathor, 2014
 # Marcel Kühlhorn <tux93@opensuse.org>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 16:10+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 08:50+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"
@@ -28,36 +28,27 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Ablaufdatum liegt in der Vergangenheit."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "An folgende Benutzer konnte keine E-Mail gesendet werden: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Wartungsmodus eingeschaltet "
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Wartungsmodus ausgeschaltet"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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 "Weder Bild noch ein Datei wurden zur Verfügung gestellt"
@@ -154,127 +145,135 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:995
+#: js/js.js:1099
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:996
+#: js/js.js:1100
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:997
+#: js/js.js:1101
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:998
+#: js/js.js:1102
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:999
+#: js/js.js:1103
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1000
+#: js/js.js:1104
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1001
+#: js/js.js:1105
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1002
+#: js/js.js:1106
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1003
+#: js/js.js:1107
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:1004
+#: js/js.js:1108
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1005
+#: js/js.js:1109
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:125
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:146
+#: js/oc-dialogs.js:151
 msgid "Error loading file picker template: {error}"
 msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:177
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:182
+#: js/oc-dialogs.js:187
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:199
+#: js/oc-dialogs.js:204
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:219
+#: js/oc-dialogs.js:224
 msgid "Error loading message template: {error}"
 msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
 
-#: js/oc-dialogs.js:347
+#: js/oc-dialogs.js:352
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} Dateikonflikt"
 msgstr[1] "{count} Dateikonflikte"
 
-#: js/oc-dialogs.js:361
+#: js/oc-dialogs.js:366
 msgid "One file conflict"
 msgstr "Ein Dateikonflikt"
 
-#: js/oc-dialogs.js:367
+#: js/oc-dialogs.js:372
+msgid "New Files"
+msgstr "Neue Dateien"
+
+#: js/oc-dialogs.js:373
+msgid "Already existing files"
+msgstr "Die Dateien existieren bereits"
+
+#: js/oc-dialogs.js:375
 msgid "Which files do you want to keep?"
 msgstr "Welche Dateien möchten Sie behalten?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:376
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:384
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:394
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
 msgid "(all selected)"
 msgstr "(Alle ausgewählt)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:457
 msgid "({count} selected)"
 msgstr "({count} ausgewählt)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:465
 msgid "Error loading file exists template"
 msgstr "Fehler beim Laden der vorhanden Dateivorlage"
 
@@ -307,11 +306,11 @@ msgid "Share"
 msgstr "Teilen"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -427,19 +426,19 @@ msgstr "Passwortgeschützt"
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warnung"
 
@@ -553,6 +552,18 @@ msgstr "Neues Passwort"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
+#: 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 OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!"
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 7c4185007d3..87841fc3da6 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -10,7 +10,7 @@
 # Marcel Kühlhorn <tux93@opensuse.org>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
 # noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 21:50+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -28,48 +28,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" ist kein gültiger Dateiname."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Keine gültige Quelle"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -79,74 +79,74 @@ msgstr "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfi
 msgid "Error while downloading %s to %s"
 msgstr "Fehler beim Herunterladen von %s nach %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fehler beim Erstellen des Ordners"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Ungültiges Merkmal"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei konnte nur teilweise übertragen werden"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -167,92 +167,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "Die URL darf nicht leer sein"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Das Benutzerverzeichnis 'Shared' ist ein reservierter Dateiname"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Die Datei konnte nicht erstellt werden"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Der Ordner konnte nicht erstellt werden"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Fehler beim Abrufen der URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Fehler beim Verschieben der Datei"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Fehler"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Die Datei konnte nicht umbenannt werden"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name} wurde ersetzt durch {new_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "rückgängig machen"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Fehler beim Löschen der Datei."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} und {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hoch geladen"
@@ -289,29 +289,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Fehler beim Verschieben der Datei"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Fehler"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Geändert"
 
@@ -319,113 +311,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Dateibehandlung"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximale Upload-Größe"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maximal möglich:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Für Mehrfachdatei- und Ordnerdownloads benötigt:"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP-Download aktivieren"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 bedeutet unbegrenzt"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale Größe für ZIP-Dateien"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Neue Textdatei"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Neues Ordner"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/de_DE/files_external.po
index 7e0969deb09..214a786b82f 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2014
 # 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: 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"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 18: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"
@@ -40,91 +41,100 @@ msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Hinweis:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr "und"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Achtung:</b> Die Curl-Unterstützung  von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Ordnername"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Optionen"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Zutreffend"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Verfügbar für"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Speicher hinzufügen"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nicht definiert"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Kein Nutzer oder Gruppe"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Alle Benutzer"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 9bd58decbd8..94fe0bdbef2 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# I Robot, 2014
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 21:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 08:50+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"
@@ -70,23 +71,23 @@ msgstr "Ungültiges Bild"
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -197,8 +198,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Passwort ungültig: %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 "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
@@ -211,9 +212,9 @@ msgstr "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig"
 #: 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 Fehler: \"%s\""
@@ -222,9 +223,9 @@ msgstr "DB Fehler: \"%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 "Fehlerhafter Befehl war: \"%s\""
@@ -260,7 +261,7 @@ msgstr "Oracle Benutzername und/oder Passwort ungültig"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %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 Benutzername und/oder Passwort ungültig"
 
@@ -272,19 +273,19 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:198
+#: 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 "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s hat »%s« mit Ihnen geteilt"
@@ -341,3 +342,21 @@ msgstr "Letztes Jahr"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "Vor  Jahren"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Folgende Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\" und \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Es muss ein gültiger Benutzername angegeben werden"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Es muss ein gültiges Passwort angegeben werden"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Der Benutzername existiert bereits"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 7a0b42a6be0..6dfc08877fd 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -11,14 +11,14 @@
 # traductor, 2013
 # noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
-# kabum <uu.kabum@gmail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 11:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: kabum <uu.kabum@gmail.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"
@@ -56,15 +56,15 @@ msgstr "Email gesendet"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Sende-Modus"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Authentifizierungsmethode"
 
@@ -73,7 +73,7 @@ msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:55
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
 msgstr "Authentifizierungs-Fehler"
 
@@ -135,32 +135,32 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 msgid "Couldn't update app."
 msgstr "Die App konnte nicht aktualisiert werden."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Keinen Benutzer angegeben"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 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 Benutzerdaten verloren gehen können"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut."
 
-#: 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 "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Passwort konnte nicht geändert werden"
 
@@ -212,7 +212,7 @@ msgstr "Es ist ein Fehler während des Updates aufgetreten"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Update durchführen"
 
@@ -220,7 +220,7 @@ msgstr "Update durchführen"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Wählen Sie ein Profilbild"
 
@@ -244,7 +244,7 @@ msgstr "Gutes Passwort"
 msgid "Strong password"
 msgstr "Starkes Passwort"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
 
@@ -293,7 +293,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
@@ -350,7 +350,7 @@ msgstr "Sicherheitshinweis"
 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."
+msgstr "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, dass stattdessen HTTPS verlangt wird."
 
 #: templates/admin.php:64
 msgid ""
@@ -436,157 +436,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Share-API aktivieren"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: templates/admin.php:212
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen"
 
-#: templates/admin.php:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Mail-Benachrichtigung erlauben"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:261
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen."
 
-#: templates/admin.php:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "E-Mail-Server"
 
-#: templates/admin.php:281
+#: 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:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Absender-Adresse"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Authentifizierung benötigt"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Zugangsdaten"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP Benutzername"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP Passwort"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "E-Mail-Einstellungen testen"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "E-Mail senden"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -604,23 +620,23 @@ msgstr "Fügen Sie Ihre Anwendung hinzu"
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Wählen Sie eine Anwendung aus"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Dokumentation:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Siehe Anwendungs-Website"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
@@ -657,108 +673,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Ihr Passwort wurde geändert."
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilbild"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Neues hochladen"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Neues aus Dateien wählen"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Bild entfernen"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Ihr Avatar wird von Ihrerem ursprünglichenKonto verwendet."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Als Profilbild wählen"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index c96d99dfa1a..cfcb1ae0423 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -7,14 +7,14 @@
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:11+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 18:40+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"
@@ -150,7 +150,7 @@ msgstr[1] "%s Benutzer gefunden"
 msgid "Invalid Host"
 msgstr "Ungültiger Host"
 
-#: lib/wizard.php:963
+#: lib/wizard.php:983
 msgid "Could not find the desired feature"
 msgstr "Konnte die gewünschte Funktion nicht finden"
 
@@ -425,41 +425,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Seitenstücke (Paging chunksize)"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kontingent-Feld"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Standard-Kontingent"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -475,15 +486,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Interne Eigenschaften des Benutzers:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -494,19 +505,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID-Attribute für Benutzer:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-Attribute für Gruppen:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -520,10 +531,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 306f08e1df2..cc9851ee84b 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -6,6 +6,7 @@
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# pe_ppe <peppe@cs.uoi.gr>, 2014
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # vkehayas <vkehayas@gmail.com>, 2013-2014
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 14:13+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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,36 +27,27 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Η ημερομηνία λήξης είναι στο παρελθόν."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s"
 
-#: 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 "... %d%% ολοκληρώθηκαν ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Δεν δόθηκε εικόνα ή αρχείο"
@@ -152,63 +144,63 @@ msgstr "Νοέμβριος"
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Γίνεται αποθήκευση..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n λεπτό πριν"
 msgstr[1] "%n λεπτά πριν"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ώρα πριν"
 msgstr[1] "%n ώρες πριν"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "σήμερα"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ημέρα πριν"
 msgstr[1] "%n ημέρες πριν"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n μήνας πριν"
 msgstr[1] "%n μήνες πριν"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "μήνες πριν"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "χρόνια πριν"
 
@@ -247,34 +239,42 @@ msgid "One file conflict"
 msgstr "Ένα αρχείο διαφέρει"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Νέα Αρχεία"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Ποια αρχεία θέλετε να κρατήσετε;"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Συνέχεια"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(όλα τα επιλεγμένα)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} επιλέχθησαν)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
-msgstr ""
+msgstr "Σφάλμα κατά την φόρτωση του προτύπου ύπαρξης αρχείου"
 
 #: js/setup.js:84
 msgid "Very weak password"
@@ -286,7 +286,7 @@ msgstr "Αδύναμο συνθηματικό"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Μέτριο συνθηματικό"
 
 #: js/setup.js:87
 msgid "Good password"
@@ -305,11 +305,11 @@ msgid "Share"
 msgstr "Διαμοιρασμός"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Σφάλμα κατά τον διαμοιρασμό"
 
@@ -425,19 +425,19 @@ msgstr "Προστασία με συνθηματικό"
 msgid "Error unsetting expiration date"
 msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Αποστολή..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Το Email απεστάλη "
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
@@ -551,6 +551,18 @@ 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 "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!"
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Προσωπικά"
@@ -671,7 +683,7 @@ msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχ�
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Αποθήκευση & βάση δεδομένων"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -772,7 +784,7 @@ msgstr "Εναλλακτικές Συνδέσεις"
 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 ""
+msgstr "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<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/el/files.po b/l10n/el/files.po
index 761c6f0eb4e..152ba67cc86 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -7,14 +7,15 @@
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # gtsamis <gtsamis@yahoo.com>, 2013
 # frerisp <petrosfreris@gmail.com>, 2013
+# pe_ppe <peppe@cs.uoi.gr>, 2014
 # vkehayas <vkehayas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 14:21+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +23,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Το όνομα αρχείου δεν μπορεί να είναι κενό."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "Το \"%s\" είναι ένα μη έγκυρο όνομα αρχείου."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Ο φάκελος προορισμού έχει μετακινηθεί ή διαγραφεί."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Μη έγκυρη πηγή"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Ο διακομιστής δεν επιτρέπεται να ανοίγει URL, παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή"
@@ -73,74 +74,74 @@ msgstr "Ο διακομιστής δεν επιτρέπεται να ανοίγ�
 msgid "Error while downloading %s to %s"
 msgstr "Σφάλμα κατά τη λήψη του %s στο %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Σφάλμα δημιουργίας φακέλου"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Αδυναμία ορισμού καταλόγου αποστολής."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Μη έγκυρο Token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Το αρχείο που εστάλει υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο εστάλει μόνο εν μέρει"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Κανένα αρχείο δεν στάλθηκε"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Αποτυχία εγγραφής στο δίσκο"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Η φόρτωση απέτυχε. Αδυναμία εύρεσης αρχείου προς φόρτωση."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Η φόρτωση απέτυχε. Αδυναμία λήψης πληροφοριών αρχείων."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Μη έγκυρος φάκελος."
 
@@ -154,99 +155,99 @@ msgstr "Αδυναμία φόρτωσης {filename} καθώς είναι κα�
 
 #: js/file-upload.js:258
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}"
 
 #: js/file-upload.js:268
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}"
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Αδυναμία λήψης αποτελέσματος από το διακομιστή."
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "Η URL δεν πρέπει να είναι κενή"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Στον αρχικό φάκελο το όνομα 'Shared' διατηρείται από το σύστημα"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Αδυναμία δημιουργίας αρχείου"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Αδυναμία δημιουργίας φακέλου"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Σφάλμα φόρτωσης URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Αδυναμία μετονομασίας αρχείου"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "αναίρεση"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Σφάλμα διαγραφής αρχείου."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n φάκελος"
 msgstr[1] "%n φάκελοι"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n αρχείο"
 msgstr[1] "%n αρχεία"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{Κατάλογοι αρχείων} και {αρχεία}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Ανέβασμα %n αρχείου"
@@ -283,29 +284,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις"
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
@@ -313,113 +306,109 @@ msgstr "Τροποποιήθηκε"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Άκυρο όνομα φακέλου. Η χρήση του 'Shared' διατηρείται από το σύστημα."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Αδυναμία μετονομασίας του %s"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Μεταφόρτωση"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Διαχείριση αρχείων"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Μέγιστο μέγεθος αποστολής"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "μέγιστο δυνατό:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Απαραίτητο για κατέβασμα πολλαπλών αρχείων και φακέλων"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Ενεργοποίηση κατεβάσματος ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 για απεριόριστο"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Μέγιστο μέγεθος για αρχεία ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Νέο"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Νέο αρχείο κειμένου"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Αρχείο κειμένου"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Από σύνδεσμο"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Διαγραμμένα αρχεία"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Ακύρωση αποστολής"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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 bd28873a5e1..0398e975672 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -5,6 +5,7 @@
 # Translators:
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # Marios Bekatoros <>, 2013
+# pe_ppe <peppe@cs.uoi.gr>, 2014
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # vkehayas <vkehayas@gmail.com>, 2013
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-01 01:55-0400\n"
+"PO-Revision-Date: 2014-03-31 16:30+0000\n"
+"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\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"
@@ -106,7 +107,7 @@ msgstr "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπ
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index ca669ad43ad..8ffa8026920 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pe_ppe <peppe@cs.uoi.gr>, 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: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 14:21+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +39,100 @@ msgstr "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox κα
 msgid "Error configuring Google Drive storage"
 msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Αποθηκεύτηκαν"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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> Η υποστήριξη του συστήματος Curl στο PHP δεν είναι ενεργοποιημένη ή εγκαταστημένη. Η αναπαραγωγή του ownCloud/WebDAV ή GoogleDrive δεν είναι δυνατή. Παρακαλώ ρωτήστε τον διαχειριστλη του συστήματος για την εγκατάσταση. "
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Εξωτερικό Αποθηκευτικό Μέσο"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Όνομα φακέλου"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Εξωτερική αποθήκευση"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Επιλογές"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Εφαρμόσιμο"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Προσθηκη αποθηκευσης"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Κανένα επιλεγμένο"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Όλοι οι Χρήστες"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Χρήστες"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Πιστοποιητικά SSL root"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Εισαγωγή Πιστοποιητικού Root"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 8f6d6e8c547..49613a13f1c 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -5,14 +5,15 @@
 # Translators:
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# pe_ppe <peppe@cs.uoi.gr>, 2014
 # 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-03-16 03:12-0400\n"
-"PO-Revision-Date: 2014-03-15 22:50+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -68,23 +69,23 @@ msgstr "Μη έγκυρη εικόνα"
 msgid "web services under your control"
 msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Πίσω στα Αρχεία"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -234,7 +235,7 @@ msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL/Ma
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Κατάργηση του χρήστη από MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
@@ -243,7 +244,7 @@ msgstr "Υπάρχει ήδη ο χρήστης '%s'@'%%' της MySQL/MariaDB"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Κατάργηση του χρήστη από MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -270,19 +271,19 @@ msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
 msgid "Set an admin password."
 msgstr "Εισάγετε συνθηματικό διαχειριστή."
 
-#: private/setup.php:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
@@ -339,3 +340,21 @@ msgstr "τελευταίο χρόνο"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "χρόνια πριν"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 5a5c9e89330..e59b95e37c3 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -6,6 +6,7 @@
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# pe_ppe <peppe@cs.uoi.gr>, 2014
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # vkehayas <vkehayas@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: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 14:21+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\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"
@@ -28,7 +29,7 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Άκυρη τιμή για το %s"
 
 #: admin/controller.php:73
 msgid "Saved"
@@ -55,15 +56,15 @@ msgstr "Το Email απεστάλη "
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Κατάσταση αποστολής"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Μέθοδος πιστοποίησης"
 
@@ -72,7 +73,7 @@ msgid "Unable to load list from App Store"
 msgstr "Σφάλμα στην φόρτωση της λίστας από το 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 "Σφάλμα πιστοποίησης"
 
@@ -134,32 +135,32 @@ 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 "Αδυναμία αλλαγής συνθηματικού"
 
@@ -211,7 +212,7 @@ msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογή�
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Ενημέρωση"
 
@@ -219,31 +220,31 @@ msgstr "Ενημέρωση"
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Επιλογή εικόνας προφίλ"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Πολύ αδύναμο συνθηματικό"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Αδύναμο συνθηματικό"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
-msgstr ""
+msgstr "Μέτριο συνθηματικό"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Καλό συνθηματικό"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Δυνατό συνθηματικό"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο."
 
@@ -292,7 +293,7 @@ msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -326,7 +327,7 @@ msgstr "Σύνδεση"
 
 #: templates/admin.php:18
 msgid "Plain"
-msgstr ""
+msgstr "Απλό"
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
@@ -435,157 +436,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Η τελευταία εκτέλεση του cron ήταν στις %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 ήταν στις %s. Αυτό είναι πάνω από μια ώρα πριν, ίσως κάτι δεν πάει καλά."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Η διεργασία cron δεν εκτελέστηκε ακόμα!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται"
 
-#: templates/admin.php:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Διαμοιρασμός"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Ενεργοποίηση API Διαμοιρασμού"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Να επιτρέπονται σύνδεσμοι"
 
-#: templates/admin.php:203
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
 
-#: templates/admin.php:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Επιτρέψτε κοινόχρηστο ανέβασμα"
 
-#: templates/admin.php:212
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Επιτρέψτε στους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους"
 
-#: templates/admin.php:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Να επιτρέπεται ο επαναδιαμοιρασμός"
 
-#: templates/admin.php:221
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
 
-#: templates/admin.php:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε"
 
-#: templates/admin.php:231
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
 
-#: templates/admin.php:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Επιτρέψτε ειδοποιήσεις ηλεκτρονικού ταχυδρομείου"
 
-#: templates/admin.php:239
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Επιτρέψτε στο χρήστη να στέλνει ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία"
 
-#: templates/admin.php:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Ασφάλεια"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Επιβολή χρήσης HTTPS"
 
-#: templates/admin.php:261
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Επιβάλλει τους δέκτες να συνδέονται με το %s μέσω κρυπογραφημένης σύνδεσης."
 
-#: templates/admin.php:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Διακομιστής Email"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Χρησιμοποιείται για αποστολή ειδοποιήσεων."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Από τη διεύθυνση"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Διεύθυνση διακομιστή"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Θύρα"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Πιστοποιητικά"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Όνομα χρήστη SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Συνθηματικό SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Δοκιμή ρυθμίσεων email"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Αποστολή email"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Καταγραφές"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Επίπεδο καταγραφής"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Περισσότερα"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Λιγότερα"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -603,23 +620,23 @@ msgstr "Προσθέστε Δικιά σας Εφαρμογή"
 msgid "More Apps"
 msgstr "Περισσότερες Εφαρμογές"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Επιλέξτε μια Εφαρμογή"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Τεκμηρίωση:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Δείτε την ιστοσελίδα της εφαρμογής"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Άδεια χρήσης <span class=\"licence\"></span> από <span class=\"author\"></span>"
 
@@ -656,108 +673,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Το συνθηματικό σας έχει αλλάξει"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Τρέχων συνθηματικό"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Νέο συνθηματικό"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Αλλαγή συνθηματικού"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Πλήρες όνομα"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Ηλεκτρονικό ταχυδρομείο"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Η διεύθυνση ηλ. ταχυδρομείου σας"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr "Συμπληρώστε μια διεύθυνση email για να ενεργοποιήσετε την επαναφορά συνθηματικού και να λαμβάνετε ειδοποιήσεις"
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Φωτογραφία προφίλ"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Μεταφόρτωση νέου"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Επιλογή νέου από τα Αρχεία"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Αφαίρεση εικόνας"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε."
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Επιλογή εικόνας προφίλ"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Βοηθήστε στη μετάφραση"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας"
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Συνθηματικό εισόδου"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Αποκρυπτογράφηση όλων των Αρχείων"
 
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 5f0073e1a0d..690afb7856d 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Marios Bekatoros <>, 2013
+# pe_ppe <peppe@cs.uoi.gr>, 2014
 # 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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -165,7 +166,7 @@ msgstr "Βοήθεια"
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
 msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+msgstr "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -201,7 +202,7 @@ msgstr "ομάδες βρέθηκαν"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -269,7 +270,7 @@ msgstr "Μπορείτε να καθορίσετε το Base DN για χρήσ�
 #: templates/part.wizard-userfilter.php:4
 #, php-format
 msgid "Limit %s access to users meeting these criteria:"
-msgstr ""
+msgstr "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -413,7 +414,7 @@ msgstr "Group-Member association"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+msgstr "Φωλιασμένες ομάδες"
 
 #: templates/settings.php:39
 msgid ""
@@ -421,41 +422,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Ειδικά Χαρακτηριστικά "
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Ποσοσταση πεδιου"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Προκαθισμενο πεδιο"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "σε bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Email τυπος"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας "
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Εσωτερικό Όνομα Χρήστη"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +483,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Ιδιότητα Εσωτερικού Ονόματος Χρήστη:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Παράκαμψη ανίχνευσης UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +502,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Από προεπιλογή, το χαρακτηριστικό UUID εντοπίζεται αυτόματα. Το χαρακτηριστικό UUID χρησιμοποιείται για την αναγνώριση χωρίς αμφιβολία χρηστών και ομάδων LDAP. Επίσης, το εσωτερικό όνομα χρήστη θα δημιουργηθεί με βάση το UUID, εφόσον δεν ορίζεται διαφορετικά ανωτέρω. Μπορείτε να παρακάμψετε τη ρύθμιση και να ορίσετε ένα χαρακτηριστικό της επιλογής σας. Θα πρέπει να βεβαιωθείτε ότι το χαρακτηριστικό της επιλογής σας μπορεί να ληφθεί για τους χρήστες και τις ομάδες και ότι είναι μοναδικό. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε πρόσφατα αντιστοιχισμένους (προστιθέμενους) χρήστες και ομάδες LDAP."
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Χαρακτηριστικό UUID για Χρήστες:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Χαρακτηριστικό UUID για Ομάδες:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Αντιστοίχιση Χρηστών Όνομα Χρήστη-LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +528,10 @@ msgid ""
 "experimental stage."
 msgstr "Τα ονόματα χρηστών χρησιμοποιούνται για την αποθήκευση και την ανάθεση (μετα) δεδομένων. Προκειμένου να προσδιοριστούν με ακρίβεια και να αναγνωρίστουν οι χρήστες, κάθε χρήστης LDAP θα έχει ένα εσωτερικό όνομα. Αυτό απαιτεί μια αντιστοίχιση του ονόματος χρήστη με το χρήστη LDAP. Το όνομα χρήστη που δημιουργήθηκε αντιστοιχίζεται στην UUID του χρήστη LDAP. Επιπροσθέτως, το DN αποθηκεύεται προσωρινά (cache) ώστε να μειωθεί η αλληλεπίδραση LDAP, αλλά δεν χρησιμοποιείται για την ταυτοποίηση. Αν το DN αλλάξει, οι αλλαγές θα βρεθούν. Το εσωτερικό όνομα χρήστη χρησιμοποιείται παντού. Η εκκαθάριση των αντιστοιχίσεων θα αφήσει κατάλοιπα παντού. Η εκκαθάριση των αντιστοιχίσεων δεν επηρεάζεται από τη διαμόρφωση, επηρεάζει όλες τις διαμορφώσεις LDAP! Μην διαγράψετε ποτέ τις αντιστοιχίσεις σε ένα λειτουργικό περιβάλλον παρά μόνο σε δοκιμές ή σε πειραματικό στάδιο."
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Διαγραφή αντιστοίχησης Ονόματος Χρήστη LDAP-Χρήστη"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Διαγραφή αντιστοίχησης Ονόματος Ομάδας-LDAP Ομάδας"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 6815c6cf781..ccdc20247b6 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,63 +135,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -417,19 +416,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -543,6 +542,18 @@ 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 ""
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 37d98d43f5f..eff254ddd36 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: en@pirate\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po
index 0b58c4de7a4..b4caece8b5d 100644
--- a/l10n/en@pirate/files_external.po
+++ b/l10n/en@pirate/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index de836bfdfb5..ac875a524d7 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index c5d784097eb..5860fa8a930 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index e236d0b96dc..dc0cd36afee 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 5c62e786723..bb299a375b4 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-18 01:55-0400\n"
-"PO-Revision-Date: 2014-03-17 13:07+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 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,36 +18,27 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Expiration date is in the past."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Couldn't send mail to following users: %s "
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Turned on maintenance mode"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Turned off maintenance mode"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -144,63 +135,63 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Settings"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Saving..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "seconds ago"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute ago"
 msgstr[1] "%n minutes ago"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hour ago"
 msgstr[1] "%n hours ago"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "today"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "yesterday"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n day ago"
 msgstr[1] "%n days ago"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "last month"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n month ago"
 msgstr[1] "%n months ago"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "months ago"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "last year"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "years ago"
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr "One file conflict"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "New Files"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr "Already existing files"
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Which files do you wish to keep?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "If you select both versions, the copied file will have a number added to its name."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancel"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continue"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(all selected)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} selected)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Error loading file exists template"
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr "Share"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error whilst sharing"
 
@@ -417,19 +416,19 @@ msgstr "Password protected"
 msgid "Error unsetting expiration date"
 msgstr "Error unsetting expiration date"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sending ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email sent"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warning"
 
@@ -543,6 +542,18 @@ msgstr "New password"
 msgid "Reset password"
 msgstr "Reset password"
 
+#: 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 is not supported and %s will not work properly on this platform. Use it at your own risk! "
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index 6952d92459c..aa6ca243be8 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:10+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +18,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "File name cannot be empty."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" is an invalid file name."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Not a valid source"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -69,74 +69,74 @@ msgstr "Server is not allowed to open URLs, please check the server configuratio
 msgid "Error while downloading %s to %s"
 msgstr "Error whilst downloading %s to %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Error when creating the folder"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Unable to set upload directory."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Invalid Token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "No file was uploaded. Unknown error"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "There is no error, the file uploaded successfully"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "The uploaded file was only partially uploaded"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "No file was uploaded"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Missing a temporary folder"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Failed to write to disk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Not enough storage available"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload failed. Could not find uploaded file"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Upload failed. Could not get file info."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Invalid directory."
 
@@ -157,92 +157,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload cancelled."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Could not get result from server."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL cannot be empty"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} already exists"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Could not create file"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Could not create folder"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Error fetching URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Share"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Delete permanently"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Rename"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Error moving file"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Pending"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Could not rename file"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "replaced {new_name} with {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "undo"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Error deleting file."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n files"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} and {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploading %n file"
@@ -279,29 +279,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Error moving file"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Size"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modified"
 
@@ -309,113 +301,109 @@ msgstr "Modified"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Invalid folder name. Usage of 'Shared' is reserved."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s could not be renamed"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "File handling"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximum upload size"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. possible: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Needed for multi-file and folder downloads."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Enable ZIP-download"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 is unlimited"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maximum input size for ZIP files"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Save"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "New"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "New text file"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Text file"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "New folder"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "From link"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Deleted files"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Cancel upload"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Nothing in here. Upload something!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Upload too large"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Files are being scanned, please wait."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/en_GB/files_external.po
index c0315649afd..03485fd10eb 100644
--- a/l10n/en_GB/files_external.po
+++ b/l10n/en_GB/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:10+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 14: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"
@@ -38,91 +38,100 @@ msgstr "Please provide a valid Dropbox app key and secret."
 msgid "Error configuring Google Drive storage"
 msgstr "Error configuring Google Drive storage"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Saved"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Note:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr " and "
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "External Storage"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Folder name"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "External storage"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuration"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Options"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Available for"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Add storage"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "None set"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "No user or group"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "All Users"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Groups"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Users"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Enable User External Storage"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Allow users to mount the following external storage"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL root certificates"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Import Root Certificate"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 9eb29ced3e9..bb29a772bc7 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-18 01:55-0400\n"
-"PO-Revision-Date: 2014-03-17 13:08+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 14: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"
@@ -66,23 +66,23 @@ msgstr "Invalid image"
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP download is turned off."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Files need to be downloaded one by one."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Back to Files"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Selected files too large to generate zip file."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -268,19 +268,19 @@ msgstr "Set an admin username."
 msgid "Set an admin password."
 msgstr "Set an admin password."
 
-#: private/setup.php:198
+#: 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 "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s shared \"%s\" with you"
@@ -337,3 +337,21 @@ msgstr "last year"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "years ago"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "A valid username must be provided"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "A valid password must be provided"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "The username is already being used"
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index fcc17d943e3..5d7ff3543fd 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-18 01:55-0400\n"
-"PO-Revision-Date: 2014-03-17 13:07+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06: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"
@@ -48,15 +48,15 @@ msgstr "Email sent"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Send mode"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Encryption"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Authentication method"
 
@@ -65,7 +65,7 @@ msgid "Unable to load list from App Store"
 msgstr "Unable to load list from 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 "Authentication error"
 
@@ -127,32 +127,32 @@ msgstr "Unable to remove user from group %s"
 msgid "Couldn't update app."
 msgstr "Couldn't update app."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Incorrect password"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "No user supplied"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Please provide an admin recovery password, otherwise all user data will be lost"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Incorrect admin recovery password. Please check the password and try again."
 
-#: 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 "Back-end doesn't support password change, but the user's encryption key was successfully updated."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Unable to change password"
 
@@ -204,7 +204,7 @@ msgstr "Error whilst updating app"
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Update"
 
@@ -212,31 +212,31 @@ msgstr "Update"
 msgid "Updated"
 msgstr "Updated"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Select a profile picture"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Very weak password"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Weak password"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "So-so password"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Good password"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Strong password"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decrypting files... Please wait, this can take some time."
 
@@ -285,7 +285,7 @@ msgstr "A valid password must be provided"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warning: Home directory for user \"{user}\" already exists"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -428,157 +428,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Sharing"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Enable Share API"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Allow apps to use the Share API"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Allow links"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Allow public uploads"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Allow resharing"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Allow users to share with anyone"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Allow mail notification"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Security"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Enforce HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Email Server"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "This is used for sending out notifications."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "From address"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Server address"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Credentials"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP Username"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP Password"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Test email settings"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Send email"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log level"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "More"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Less"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "Add your App"
 msgid "More Apps"
 msgstr "More Apps"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Select an App"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentation:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "See application page at apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "See application website"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
@@ -649,108 +665,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Your password was changed"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Unable to change your password"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Current password"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "New password"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Change password"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Full Name"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Your email address"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profile picture"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Upload new"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Select new from Files"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Remove image"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Your avatar is provided by your original account."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Cancel"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Choose as profile image"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Language"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Help translate"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Log-in password"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Decrypt all Files"
 
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index a2648a790d3..005aa3cebae 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:10+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 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"
@@ -420,41 +420,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Paging chunksize"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Quota Field"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Quota Default"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Email Field"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "User Home Folder Naming Rule"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Internal Username"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Internal Username Attribute:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Override UUID detection"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID Attribute for Users:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID Attribute for Groups:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Username-LDAP User Mapping"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 "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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Clear Username-LDAP User Mapping"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 817aa800c69..36bf5f5ca70 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 "Ĝisdatiĝis datumbazo"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Ĝisdatigante la dosierkaŝmemoron, ĉi tio povas daŭri tro longe..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Ĝisdatiĝis dosierkaŝmemoro"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% plenumiĝis ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -145,63 +136,63 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Decembro"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Konservante..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekundoj antaŭe"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "antaŭ %n minuto"
 msgstr[1] "antaŭ %n minutoj"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "antaŭ %n horo"
 msgstr[1] "antaŭ %n horoj"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hodiaŭ"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "antaŭ %n tago"
 msgstr[1] "antaŭ %n tagoj"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "antaŭ %n monato"
 msgstr[1] "antaŭ %n monatoj"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "monatoj antaŭe"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "jaroj antaŭe"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr "Unu dosierkonflikto"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Novaj dosieroj"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Kiujn dosierojn vi volas konservi?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(ĉiuj elektitas)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} elektitas)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "Kunhavigi"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Eraro"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
@@ -418,19 +417,19 @@ msgstr "Protektita per pasvorto"
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "La retpoŝtaĵo sendiĝis"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Averto"
 
@@ -544,6 +543,18 @@ msgstr "Nova pasvorto"
 msgid "Reset password"
 msgstr "Rekomenci la pasvorton"
 
+#: 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 "Persona"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index fb6e725900e..832bb3b8468 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -18,48 +18,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Dosiernomo devas ne malpleni."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Nevalida fonto"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -69,74 +69,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr "Eraris elŝuto de %s al %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Eraris la kreo de la dosierujo"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Ne povis agordiĝi la alŝuta dosierujo."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Neniu dosiero alŝutiĝis."
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Mankas provizora dosierujo."
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Ne haveblas sufiĉa memoro"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "La alŝuto malsukcesis. Ne troviĝis alŝutota dosiero."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
@@ -157,92 +157,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "La URL ne povas malpleni"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Ne povis kreiĝi dosiero"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Ne povis kreiĝi dosierujo"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Forigi por ĉiam"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Eraris movo de dosiero"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Eraro"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Ne povis alinomiĝi dosiero"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "anstataŭiĝis {new_name} per {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "malfari"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosierujo"
 msgstr[1] "%n dosierujoj"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosiero"
 msgstr[1] "%n dosieroj"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} kaj {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Alŝutatas %n dosiero"
@@ -279,29 +279,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Eraris movo de dosiero"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Eraro"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modifita"
 
@@ -309,113 +301,109 @@ msgstr "Modifita"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ne povis alinomiĝi"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Dosieradministro"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimuma alŝutogrando"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maks. ebla: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Necesa por elŝuto de pluraj dosieroj kaj dosierujoj."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Kapabligi ZIP-elŝuton"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 signifas senlime"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimuma enirgrando por ZIP-dosieroj"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Konservi"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nova"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Tekstodosiero"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nova dosierujo"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Dosierujo"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "El ligilo"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Forigitaj dosieroj"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Alŝuto tro larĝa"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/eo/files_external.po
index da6e5db6020..b92b2672f90 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan."
 msgid "Error configuring Google Drive storage"
 msgstr "Eraro dum agordado de la memorservo Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Malena memorilo"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Dosierujnomo"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Agordo"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Malneproj"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplikebla"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nenio agordita"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Ĉiuj uzantoj"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Uzantoj"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Kapabligi malenan memorilon de uzanto"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Radikaj SSL-atestoj"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Enporti radikan ateston"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 61481d103bf..ac9e0fc8f4f 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -66,23 +66,23 @@ msgstr "Ne validas bildo"
 msgid "web services under your control"
 msgstr "TTT-servoj regataj de vi"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP-elŝuto estas malkapabligita."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elŝutiĝi unuope."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "La uzantonomo de MS SQL aŭ la pasvorto ne validas: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
@@ -207,9 +207,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Datumbaza eraro: “%s”"
@@ -218,9 +218,9 @@ msgstr "Datumbaza eraro: “%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 ""
@@ -256,7 +256,7 @@ msgstr "La uzantonomo de Oracle aŭ la pasvorto ne validas"
 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 "La uzantonomo de PostgreSQL aŭ la pasvorto ne validas"
 
@@ -268,19 +268,19 @@ msgstr "Starigi administran uzantonomon."
 msgid "Set an admin password."
 msgstr "Starigi administran pasvorton."
 
-#: private/setup.php:198
+#: 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 "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s kunhavigis “%s” kun vi"
@@ -337,3 +337,21 @@ msgstr "lastajare"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "jaroj antaŭe"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 8594a0204c0..74f444b43e9 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr "La retpoŝtaĵo sendiĝis"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "Ĝisdatigi"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Kunhavigo"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Kapabligi API-on por Kunhavigo"
 
-#: templates/admin.php:191
+#: 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:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Kapabligi ligilojn"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Kapabligi rekunhavigon"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Servila adreso"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Pordo"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Aŭtentigiloj"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Registronivelo"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 6f353ffd28f..83e2dc3b628 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -420,41 +420,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Specialaj atribuoj"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kampo de kvoto"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "duumoke"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Kampo de retpoŝto"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Ena uzantonomo"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atribuo de ena uzantonomo:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID-atribuo por uzantoj:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-atribuo por grupoj:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index a22496a9b49..4aad3e3b44e 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 16:21+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 20:50+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"
@@ -31,36 +31,27 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Ha pasado la fecha de caducidad"
+
+#: 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"
@@ -157,63 +148,63 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "meses antes"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "años antes"
 
@@ -252,32 +243,40 @@ msgid "One file conflict"
 msgstr "On conflicto de archivo"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nuevos Archivos"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr "Archivos ya existentes"
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "¿Que archivos deseas mantener?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(seleccionados todos)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Error cargando plantilla de archivo existente"
 
@@ -310,11 +309,11 @@ msgid "Share"
 msgstr "Compartir"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -430,19 +429,19 @@ msgstr "Protegido con contraseña"
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Precaución"
 
@@ -476,7 +475,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 ""
@@ -556,6 +555,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"
@@ -809,4 +820,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 fd2b2e29141..4868b5dab30 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 15:31+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -27,48 +27,48 @@ 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:57 js/files.js:98
+#: 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
+#: 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:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
 msgstr "La carpeta destino fue movida o eliminada."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "No es una fuente válida"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "La configuración del servidor no le permite abrir URLs, revísela."
@@ -78,74 +78,74 @@ msgstr "La configuración del servidor no le permite abrir URLs, revísela."
 msgid "Error while downloading %s to %s"
 msgstr "Error mientras se descargaba %s a %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Error al crear la carpeta."
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Incapaz de crear directorio de subida."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Token Inválido"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "No se subió ningún archivo. Error desconocido"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 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:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo subido fue sólo subido parcialmente"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "No se subió ningún archivo"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Falló al escribir al disco"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Actualización fallida. No se pudo obtener información del archivo."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -166,92 +166,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "No se pudo obtener respuesta del servidor."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "La dirección URL no puede estar vacía"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "En la carpeta home, no se puede usar 'Shared'"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "No se pudo crear el archivo"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "No se pudo crear la carpeta"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Error al descargar URL."
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Error moviendo archivo"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "reemplazado {new_name} con {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "deshacer"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Error al borrar el archivo"
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} y {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
@@ -288,29 +288,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Error moviendo archivo"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
@@ -318,113 +310,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no pudo ser renombrado"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Administración de archivos"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Tamaño máximo de subida"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "máx. posible:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Necesario para multi-archivo y descarga de carpetas"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Habilitar descarga en ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 significa ilimitado"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo para archivos ZIP de entrada"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada aquí. ¡Suba algo!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Subida demasido grande"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/es/files_external.po
index 98e23a43c56..af6aa0b29ed 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 15:31+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 18:50+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"
@@ -39,91 +39,100 @@ msgstr "Por favor, proporcione un una clave válida de la app Dropbox y una clav
 msgid "Error configuring Google Drive storage"
 msgstr "Error configurando el almacenamiento de Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Guardado"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Nota:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr "y"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Advertencia:</b> El soporte de Curl 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nombre de la carpeta"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opciones"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplicable"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Disponible para"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Añadir almacenamiento"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "No se ha configurado"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Ningún usuario o grupo"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Todos los usuarios"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento externo de usuario"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Permitir a los usuarios montar el siguiente almacenamiento externo"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificados raíz SSL"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index dd65ca15edc..f44f8bcb5b9 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 15:20+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\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"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index c4e17664608..2586fb2af3d 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: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-15 05:40+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-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"
@@ -33,11 +33,11 @@ msgstr "No se puede restaurar %s"
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/trash.js:16 js/trash.js:108 js/trash.js:157
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:853 lib/trashbin.php:855
+#: lib/trashbin.php:859 lib/trashbin.php:861
 msgid "restored"
 msgstr "recuperado"
 
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 994e3b4d6ea..91209fc57d5 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 15:31+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 15:50+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"
@@ -72,23 +72,23 @@ msgstr "Imagen inválida"
 msgid "web services under your control"
 msgstr "Servicios web bajo su control"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -199,8 +199,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Usuario y/o contraseña de MS SQL no válidos: %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 "Tiene que ingresar una cuenta existente o la del administrador."
 
@@ -213,9 +213,9 @@ msgstr "Nombre de usuario o contraseña de MySQL/MariaDB inválidos"
 #: 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 BD: \"%s\""
@@ -224,9 +224,9 @@ msgstr "Error 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 "Comando infractor: \"%s\""
@@ -262,7 +262,7 @@ msgstr "Usuario y/o contraseña de Oracle no válidos"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %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 "Usuario y/o contraseña de PostgreSQL no válidos"
 
@@ -274,19 +274,19 @@ msgstr "Configurar un nombre de usuario del administrador"
 msgid "Set an admin password."
 msgstr "Configurar la contraseña del administrador."
 
-#: private/setup.php:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ha compatido  »%s« contigo"
@@ -343,3 +343,21 @@ msgstr "año pasado"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "hace años"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Se debe proporcionar un nombre de usuario válido"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Se debe proporcionar una contraseña válida"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "El nombre de usuario ya está en uso"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 5e7045276d0..058eac2fa3c 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -8,8 +8,8 @@
 # eadeprado <eadeprado@outlook.com>, 2013
 # ggam <ggam@brainleakage.com>, 2013
 # japaol <japaol@gmail.com>, 2013
-# txelu <joseluis.tirado@gmail.com>, 2014
-# juanman <juanma@kde.org.ar>, 2013
+# Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
+# juanman <juanma@kde.org.ar>, 2013-2014
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
 # qdneren <renanqd@yahoo.com.mx>, 2013
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 21:20+0000\n"
-"Last-Translator: txelu <joseluis.tirado@gmail.com>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\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"
@@ -61,15 +61,15 @@ msgstr "Correo electrónico enviado"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Modo de envío"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -78,7 +78,7 @@ msgid "Unable to load list from App Store"
 msgstr "No se pudo cargar la lista desde el 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 "Error de autenticación"
 
@@ -140,32 +140,32 @@ msgstr "No se pudo eliminar al usuario del grupo %s"
 msgid "Couldn't update app."
 msgstr "No se pudo actualizar la aplicación."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "No se especificó un usuario"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo."
 
-#: 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 "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "No se ha podido cambiar la contraseña"
 
@@ -183,7 +183,7 @@ msgstr "Documentación para administradores"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
-msgstr "Actualizado a {appversion}"
+msgstr "Actualizar a {appversion}"
 
 #: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
@@ -217,7 +217,7 @@ msgstr "Error mientras se actualizaba la aplicación"
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Actualizar"
 
@@ -225,7 +225,7 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Seleccionar una imagen de perfil"
 
@@ -249,7 +249,7 @@ msgstr "Contraseña buena"
 msgid "Strong password"
 msgstr "Contraseña muy buena"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
 
@@ -298,7 +298,7 @@ msgstr "Se debe proporcionar una contraseña válida"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe."
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -441,157 +441,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activar API de Compartición"
 
-#: templates/admin.php:195
+#: 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:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquier persona"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones por correo electrónico"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Servidor de correo electrónico"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Esto se usa para enviar notificaciones."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Desde la dirección"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Se necesita autenticación"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Credenciales"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Nombre de usuario SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Contraseña SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Probar configuración de correo electrónico"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Enviar mensaje"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -609,23 +625,23 @@ msgstr "Añade tu aplicación"
 msgid "More Apps"
 msgstr "Más aplicaciones"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentación:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver la página de aplicaciones en apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Ver sitio web de la aplicación"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>"
 
@@ -662,108 +678,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Su contraseña ha sido cambiada"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar su contraseña"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Su dirección de correo"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Foto de perfil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Subir otra"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Seleccionar otra desde Archivos"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Borrar imagen"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Su avatar es proporcionado por su cuenta original."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Seleccionar como imagen de perfil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>"
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Contraseña de acceso"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Descifrar archivos"
 
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 9058d328ef1..836a65c92ac 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
-# txelu <joseluis.tirado@gmail.com>, 2014
+# 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
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 21:20+0000\n"
-"Last-Translator: txelu <joseluis.tirado@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -428,41 +428,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Cuota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-mail"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Regla para la carpeta Home de usuario"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nombre de usuario interno"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -478,15 +489,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atributo Nombre de usuario Interno:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Sobrescribir la detección UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -497,19 +508,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Atributo UUID para usuarios:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo UUID para Grupos:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -523,10 +534,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 70af0aa8cdc..ad7d518ec14 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No se pudieron mandar correos a los siguientes usuarios: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Modo de mantenimiento activado"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Modo de 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 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 "No se ha proveído de una imágen o archivo."
@@ -145,63 +136,63 @@ msgstr "noviembre"
 msgid "December"
 msgstr "diciembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "años atrás"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr "Un archivo en conflicto"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nuevos archivos"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "¿Qué archivos deseas retener?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(todos están seleccionados)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Error cargando la plantilla de archivo existente"
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "Compartir"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -418,19 +417,19 @@ msgstr "Protegido por contraseña"
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de vencimiento"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Mandando..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "e-mail mandado"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Atención"
 
@@ -544,6 +543,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 ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index c00c3fc4e39..4e4ff795968 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -21,48 +21,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "No es una fuente válida"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -72,74 +72,74 @@ msgstr "El servidor no está permitido abrir las URLs, por favor chequee la conf
 msgid "Error while downloading %s to %s"
 msgstr "Error mientras se descargaba %s a %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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 del directorio no puede estar vacío."
 
-#: ajax/newfolder.php:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Error al crear el directorio"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "No fue posible crear el directorio de subida."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Token Inválido"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "El archivo no fue subido. Error desconocido"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "No hay errores, el archivo fue subido con éxito"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo fue subido parcialmente"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "No se subió ningún archivo "
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Falta un directorio temporal"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Error al escribir en el disco"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "No hay suficiente almacenamiento"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Falló la carga. No se pudo encontrar el archivo subido."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Falló la carga. No se pudo obtener la información del archivo."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -160,92 +160,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "No se pudo obtener resultados del servidor."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "La URL no puede estar vacía"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "No se pudo crear el archivo"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "No se pudo crear el directorio"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Error al obtener la URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Borrar permanentemente"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Error moviendo el archivo"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Pendientes"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Error al borrar el archivo."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{carpetas} y {archivos}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
@@ -282,29 +282,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Error moviendo el archivo"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
@@ -312,113 +304,109 @@ msgstr "Modificado"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nombre de directorio inválido. 'Shared' está reservado."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "No se pudo renombrar %s"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Tratamiento de archivos"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Tamaño máximo de subida"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "máx. posible:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Es necesario para descargas multi-archivo y de directorios."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Habilitar descarga en formato ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 significa ilimitado"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo para archivos ZIP de entrada"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nueva Carpeta"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Archivos borrados"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. ¡Subí contenido!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "El tamaño del archivo que querés subir es demasiado grande"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor esperá."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/es_AR/files_external.po
index 5208f40205e..84191efc644 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Por favor, proporcioná un secreto y una contraseña válida para la apl
 msgid "Error configuring Google Drive storage"
 msgstr "Error al configurar el almacenamiento de Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Advertencia:</b> El soporte de Curl de PHP no está activo ni instalado. Montar servicios ownCloud, WebDAV y/o GoogleDrive no será posible. Pedile al administrador del sistema que lo instale."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nombre de la carpeta"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opciones"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplicable"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Añadir almacenamiento"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "No fue configurado"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Todos los usuarios"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento de usuario externo"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "certificados SSL raíz"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 338ad790c09..fc41e7c9c94 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -67,23 +67,23 @@ msgstr "Imagen inválida"
 msgid "web services under your control"
 msgstr "servicios web sobre los que tenés control"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados de a uno."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -194,8 +194,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nombre de usuario y contraseña de MS SQL no son válidas: %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 "Tenés que ingresar una cuenta existente o el administrador."
 
@@ -208,9 +208,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 "Error DB: \"%s\""
@@ -219,9 +219,9 @@ msgstr "Error DB: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "El comando no comprendido es: \"%s\""
@@ -257,7 +257,7 @@ msgstr "El nombre de usuario y/o contraseña no son válidos"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%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 "Nombre de usuario o contraseña PostgradeSQL inválido."
 
@@ -269,19 +269,19 @@ msgstr "Configurar un nombre de administrador."
 msgid "Set an admin password."
 msgstr "Configurar una contraseña de administrador."
 
-#: private/setup.php:198
+#: 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 "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s compartió \"%s\" con vos"
@@ -338,3 +338,21 @@ msgstr "el año pasado"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "años atrás"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Debe ingresar un nombre de usuario válido"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Debe ingresar una contraseña válida"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index a2131dd5f62..3b2f8487931 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -50,15 +50,15 @@ msgstr "e-mail mandado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el 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 "Error al autenticar"
 
@@ -129,32 +129,32 @@ msgstr "No es posible borrar al usuario del grupo %s"
 msgid "Couldn't update app."
 msgstr "No se pudo actualizar la App."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Clave incorrecta"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "No se ha indicado el usuario"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo"
 
-#: 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 "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
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Imposible cambiar la contraseña"
 
@@ -206,7 +206,7 @@ msgstr "Error al actualizar App"
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Actualizar"
 
@@ -214,7 +214,7 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Seleccionar una imágen de perfil"
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Desencriptando archivos... Por favor espere, esto puede tardar."
 
@@ -287,7 +287,7 @@ msgstr "Debe ingresar una contraseña válida"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Advertencia: El directorio Home del usuario \"{user}\" ya existe"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
@@ -335,18 +335,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "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:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -355,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Alerta de Configuración"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "El módulo 'fileinfo' no existe"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Su versión de PHP está fuera de término"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "\"Locale\" no está funcionando"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "La localización del sistema no puede cambiarse a una que soporta UTF-8"
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos."
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s."
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "La conexión a Internet no esta funcionando. "
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -425,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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 en el servicio webcron para llamarlo cada 15 minutos usando http."
 
-#: templates/admin.php:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos."
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Habilitar Share API"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones usar la Share API"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir Re-Compartir"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquiera."
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones por correo"
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Permitir al usuario enviar notificaciones por correo para archivos compartidos"
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Credenciales"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -598,23 +614,23 @@ msgstr "Añadí tu App"
 msgid "More Apps"
 msgstr "Más Apps"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Elegí una App"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Mirá la web de aplicaciones apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\">"
 
@@ -651,108 +667,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Tu contraseña fue cambiada"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "No fue posible cambiar tu contraseña"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nueva contraseña:"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "e-mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Tu dirección de e-mail"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Imágen de perfil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Subir nuevo"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Seleccionar nuevo desde archivos"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Remover imagen"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Su avatar es proveído por su cuenta original."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Elegir como imagen de perfil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>"
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos."
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Clave de acceso"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Desencriptar todos los archivos"
 
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index d3976c28d2e..797a098e3a8 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atributos Especiales"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Campo de cuota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Campo de e-mail"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Regla de nombre de los directorios de usuario"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nombre interno de usuario"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atributo Nombre Interno de usuario:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Sobrescribir la detección UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Atributo UUID para usuarios:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo UUID para grupos:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 250a11a79b5..911131ea81b 100644
--- a/l10n/es_CL/core.po
+++ b/l10n/es_CL/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,63 +135,63 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "mes anterior"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "meses antes"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "último año"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "años anteriores"
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr "Compartir"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Ocurrió un error mientras compartía"
 
@@ -417,19 +416,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -543,6 +542,18 @@ 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 ""
diff --git a/l10n/es_CL/files.po b/l10n/es_CL/files.po
index d4c99d3cc2d..c46a2cb830f 100644
--- a/l10n/es_CL/files.po
+++ b/l10n/es_CL/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: es_CL\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Error"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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 "Error"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/es_CL/files_external.po b/l10n/es_CL/files_external.po
index 53d85c66130..556ec2e34c7 100644
--- a/l10n/es_CL/files_external.po
+++ b/l10n/es_CL/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/es_CL/lib.po b/l10n/es_CL/lib.po
index 30b584c236c..ab7e0025c78 100644
--- a/l10n/es_CL/lib.po
+++ b/l10n/es_CL/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "último año"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "años anteriores"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po
index 608d3fd7d26..602def0e1ee 100644
--- a/l10n/es_CL/settings.po
+++ b/l10n/es_CL/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po
index 5a138f0da1b..f1d3cad48fb 100644
--- a/l10n/es_CL/user_ldap.po
+++ b/l10n/es_CL/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index a7beb23510a..10a4321b52f 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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"
@@ -143,63 +134,63 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "meses antes"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "años antes"
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr "Un conflicto de archivo"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "¿Que archivos deseas mantener?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(todos seleccionados)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Error cargando plantilla de archivo existente"
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr "Compartir"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -416,19 +415,19 @@ msgstr "Protegido con contraseña"
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Precaución"
 
@@ -542,6 +541,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 ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
index c7a1c07b60c..a0692579032 100644
--- a/l10n/es_MX/files.po
+++ b/l10n/es_MX/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "No es un origen válido"
 
-#: ajax/newfile.php:101
+#: 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."
@@ -68,74 +68,74 @@ msgstr "El servidor no puede acceder URLs; revise la configuración del servidor
 msgid "Error while downloading %s to %s"
 msgstr "Error mientras se descargaba %s a %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Error al crear la carpeta."
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Incapaz de crear directorio de subida."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Token Inválido"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "No se subió ningún archivo. Error desconocido"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 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:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo subido fue sólo subido parcialmente"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "No se subió ningún archivo"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Falló al escribir al disco"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Actualización fallida. No se pudo obtener información del archivo."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "No se pudo obtener respuesta del servidor."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "La dirección URL no puede estar vacía"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "No se pudo crear el archivo"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "No se pudo crear la carpeta"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Error al descargar URL."
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Error moviendo archivo"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "reemplazado {new_name} con {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "deshacer"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Error borrando el archivo."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} y {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
@@ -278,29 +278,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Error moviendo archivo"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
@@ -308,113 +300,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no pudo ser renombrado"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Administración de archivos"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Tamaño máximo de subida"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "máx. posible:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Necesario para multi-archivo y descarga de carpetas"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Habilitar descarga en ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 significa ilimitado"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo para archivos ZIP de entrada"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada aquí. ¡Suba algo!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Subida demasido grande"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/es_MX/files_external.po
index bc01ae7106b..85a74353c10 100644
--- a/l10n/es_MX/files_external.po
+++ b/l10n/es_MX/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "Por favor, proporcione un una clave válida de la app Dropbox y una clav
 msgid "Error configuring Google Drive storage"
 msgstr "Error configurando el almacenamiento de Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Advertencia:</b> El soporte de Curl 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nombre de la carpeta"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opciones"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplicable"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Añadir almacenamiento"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "No se ha configurado"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Todos los usuarios"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento externo de usuario"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificados raíz SSL"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po
index 239fda1a7ef..3e6f085cf41 100644
--- a/l10n/es_MX/lib.po
+++ b/l10n/es_MX/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr "Imagen inválida"
 msgid "web services under your control"
 msgstr "Servicios web bajo su control"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Usuario y/o contraseña de MS SQL no válidos: %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 "Tiene que ingresar una cuenta existente o la del administrador."
 
@@ -206,9 +206,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 "Error BD: \"%s\""
@@ -217,9 +217,9 @@ msgstr "Error 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 "Comando infractor: \"%s\""
@@ -255,7 +255,7 @@ msgstr "Usuario y/o contraseña de Oracle no válidos"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %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 "Usuario y/o contraseña de PostgreSQL no válidos"
 
@@ -267,19 +267,19 @@ msgstr "Configurar un nombre de usuario del administrador"
 msgid "Set an admin password."
 msgstr "Configurar la contraseña del administrador."
 
-#: private/setup.php:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ha compartido  »%s« contigo"
@@ -336,3 +336,21 @@ msgstr "año pasado"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "hace años"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Se debe proporcionar un nombre de usuario válido"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Se debe proporcionar una contraseña válida"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index 44e2120bd68..a2f997aea52 100644
--- a/l10n/es_MX/settings.po
+++ b/l10n/es_MX/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -47,15 +47,15 @@ msgstr "Correo electrónico enviado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgid "Unable to load list from App Store"
 msgstr "No se pudo cargar la lista desde el 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 "Error de autenticación"
 
@@ -126,32 +126,32 @@ msgstr "No se pudo eliminar al usuario del grupo %s"
 msgid "Couldn't update app."
 msgstr "No se pudo actualizar la aplicación."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "No se especificó un usuario"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo."
 
-#: 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 "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "No se ha podido cambiar la contraseña"
 
@@ -203,7 +203,7 @@ msgstr "Error mientras se actualizaba la aplicación"
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Actualizar"
 
@@ -211,7 +211,7 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Seleccionar una imagen de perfil"
 
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
 
@@ -284,7 +284,7 @@ msgstr "Se debe proporcionar una contraseña válida"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe."
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Español (México)"
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Advertencia de configuración"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "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:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "No se ha encontrado el módulo \"fileinfo\""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Su versión de PHP ha caducado"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "La configuración regional no está funcionando"
 
-#: templates/admin.php:119
+#: 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:123
+#: 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:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. "
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "La conexión a Internet no está funcionando"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activar API de Compartición"
 
-#: templates/admin.php:191
+#: 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:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquier persona"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones por correo electrónico"
 
-#: templates/admin.php:235
+#: 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:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -595,23 +611,23 @@ msgstr "Añade tu aplicación"
 msgid "More Apps"
 msgstr "Más aplicaciones"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver la página de aplicaciones en apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>"
 
@@ -648,108 +664,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Su contraseña ha sido cambiada"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar su contraseña"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Su dirección de correo"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Foto de perfil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Subir otra"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Seleccionar otra desde Archivos"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Borrar imagen"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Su avatar es proporcionado por su cuenta original."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Seleccionar como imagen de perfil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Contraseña de acceso"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Descifrar archivos"
 
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index a2926c98e42..7687611cb1c 100644
--- a/l10n/es_MX/user_ldap.po
+++ b/l10n/es_MX/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Cuota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-mail"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Regla para la carpeta Home de usuario"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nombre de usuario interno"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atributo Nombre de usuario Interno:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Sobrescribir la detección UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Atributo UUID para usuarios:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo UUID para Grupos:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 a04197c64b4..686bc7973e1 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Aegumise kuupäev on minevikus."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s "
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Haldusrežiimis sisse lülitatud"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Haldusrežiimis välja lülitatud"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -145,63 +136,63 @@ msgstr "November"
 msgid "December"
 msgstr "Detsember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Salvestamine..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut tagasi"
 msgstr[1] "%n minutit tagasi"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n tund tagasi"
 msgstr[1] "%n tundi tagasi"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n päev tagasi"
 msgstr[1] "%n päeva tagasi"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n kuu tagasi"
 msgstr[1] "%n kuud tagasi"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -240,54 +231,62 @@ msgid "One file conflict"
 msgstr "Üks failikonflikt"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Uued failid"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Milliseid faile sa soovid alles hoida?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Loobu"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Jätka"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(kõik valitud)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} valitud)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Viga faili olemasolu malli laadimisel"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Väga nõrk parool"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Nõrk parool"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Enam-vähem sobiv parool"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Hea parool"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Väga hea parool"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "Jaga"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Viga"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
@@ -418,19 +417,19 @@ msgstr "Parooliga kaitstud"
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupäeva eemaldamisel"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupäeva määramisel"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Saatmine ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-kiri on saadetud"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Hoiatus"
 
@@ -486,7 +485,7 @@ msgstr "%s parooli lähtestus"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Tekkis tõrge e-posti saatmisel, palun kontakteeru administraatoriga."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -544,6 +543,18 @@ msgstr "Uus parool"
 msgid "Reset password"
 msgstr "Nulli parool"
 
+#: 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 ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!"
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Isiklik"
@@ -664,7 +675,7 @@ msgstr "Loo <strong>admini konto</strong>"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Andmehoidla ja andmebaas"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -765,7 +776,7 @@ msgstr "Alternatiivsed sisselogimisviisid"
 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 ""
+msgstr "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>"
 
 #: 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 20d929cc5b6..e687a378812 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -19,48 +19,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" on vigane failinimi."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Sihtkataloog on ümber tõstetud või kustutatud."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Pole korrektne lähteallikas"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -70,74 +70,74 @@ msgstr "Server ei võimalda URL-ide avamist, palun kontrolli serveri seadistust"
 msgid "Error while downloading %s to %s"
 msgstr "Viga %s allalaadimisel %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Viga kataloogi loomisel"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Üleslaadimiste kausta määramine ebaõnnestus."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Vigane kontrollkood"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Saadaval pole piisavalt ruumi"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
@@ -151,99 +151,99 @@ msgstr "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus
 
 #: js/file-upload.js:258
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}."
 
 #: js/file-upload.js:268
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval."
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Serverist ei saadud tulemusi"
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL ei saa olla tühi"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Kodukataloogis 'Shared' on reserveeritud failinimi"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Ei suuda luua faili"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Ei suuda luua kataloogi"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Viga URL-i haaramisel"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Jaga"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Viga faili eemaldamisel"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Viga"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Ei suuda faili ümber nimetada"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "asendas nime {old_name} nimega {new_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "tagasi"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Viga faili kustutamisel."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kataloog"
 msgstr[1] "%n kataloogi"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fail"
 msgstr[1] "%n faili"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} ja {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laadin üles %n faili"
@@ -251,7 +251,7 @@ msgstr[1] "Laadin üles %n faili"
 
 #: js/files.js:96
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" on vigane failinimi."
 
 #: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
@@ -280,29 +280,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Viga faili eemaldamisel"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Viga"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Muudetud"
 
@@ -310,113 +302,109 @@ msgstr "Muudetud"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Vigane kausta nimi. Nime 'Shared' kasutamine on reserveeritud."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ümbernimetamine ebaõnnestus"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Lae üles"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Failide käsitlemine"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimaalne üleslaadimise suurus"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maks. võimalik: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Vajalik mitme faili ja kausta allalaadimiste jaoks."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Luba ZIP-ina allalaadimine"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 tähendab piiramatut"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Salvesta"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Uus"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Uus tekstifail"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Tekstifail"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Kaust"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Allikast"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Kustutatud failid"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Tühista üleslaadimine"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi üles!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Üleslaadimine on liiga suur"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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 565c6e20900..cb79568466e 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.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: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-02 01:55-0400\n"
+"PO-Revision-Date: 2014-04-01 07:05+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -103,7 +103,7 @@ msgstr "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun o
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
@@ -113,91 +113,91 @@ msgstr "Liigu otse oma"
 msgid "personal settings"
 msgstr "isiklikes seadetes"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Krüpteerimine"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Taastevõtme parool"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Korda taastevõtme parooli"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Sisse lülitatud"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Väljalülitatud"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Muuda taastevõtme parooli:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Vana taastevõtme parool"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Uus taastevõtme parool"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Korda uut taastevõtme parooli"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Muuda parooli"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Sinu privaatse võtme parool ei ühti enam sinu sisselogimise parooliga:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Vana sisselogimise parool"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Praegune sisselogimise parool"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Uuenda privaatse võtme parooli"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Luba parooli taaste:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Faili taaste seaded uuendatud"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Ei suuda uuendada taastefaili"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 1a9f3c54304..094d7f16ab5 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 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: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +39,100 @@ msgstr "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna."
 msgid "Error configuring Google Drive storage"
 msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
+msgstr "Salvestatud"
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Hoiatus:</b> PHP-s puudub Curl tugi. Jagatud ownCloud / WebDAV või GoogleDrive ühendamine pole võimalik. Palu oma süsteemihalduril see paigaldada."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Väline salvestuskoht"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Kausta nimi"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Väline andmehoidla"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Seadistamine"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Valikud"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Rakendatav"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Saadaval"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Lisa andmehoidla"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Pole määratud"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Ühtki kasutajat või gruppi"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Kõik kasutajad"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Kasutajad"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Luba kasutajatele väline salvestamine"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Võimalda kasutajatel ühendada järgmist välist andmehoidlat"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL root sertifikaadid"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 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 4478b66ad3e..65ad0cac72a 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-02 01:55-0400\n"
+"PO-Revision-Date: 2014-04-01 08:10+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +67,7 @@ msgstr "jagas %s"
 #: templates/public.php:44
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Laadi alla %s"
 
 #: templates/public.php:48
 msgid "Direct link"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index d163514efb3..7602de2d16e 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -3,14 +3,14 @@
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -67,23 +67,23 @@ msgstr "Vigane pilt"
 msgid "web services under your control"
 msgstr "veebitenused sinu kontrolli all"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on välja lülitatud."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida ükshaaval."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -159,7 +159,7 @@ msgstr "Kontrollkood aegus. Paelun lae leht uuesti."
 
 #: private/json.php:75
 msgid "Unknown user"
-msgstr ""
+msgstr "Tundmatu kasutaja"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -194,23 +194,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL kasutajatunnus ja/või parool pole õiged: %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 "Sisesta kas juba olemasolev konto või administrator."
 
 #: private/setup/mysql.php:12
 msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "MySQL/MariaDB kasutajatunnus ja/või parool pole õiged"
 
 #: 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 "Andmebaasi viga: \"%s\""
@@ -219,9 +219,9 @@ msgstr "Andmebaasi viga: \"%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 "Tõrkuv käsk oli: \"%s\""
@@ -229,20 +229,20 @@ msgstr "Tõrkuv käsk oli: \"%s\""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL/MariaDB kasutaja '%s'@'localhost' on juba olemas."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Kustuta see MySQL/MariaDB kasutaja"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB user '%s'@'%%' on juba olemas"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Kustuta see MySQL/MariaDB kasutaja."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -257,7 +257,7 @@ msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %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 kasutajatunnus ja/või parool pole õiged"
 
@@ -269,19 +269,19 @@ msgstr "Määra admin kasutajanimi."
 msgid "Set an admin password."
 msgstr "Määra admini parool."
 
-#: private/setup.php:198
+#: 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 "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s jagas sinuga »%s«"
@@ -338,3 +338,21 @@ msgstr "viimasel aastal"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "aastat tagasi"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Sisesta nõuetele vastav kasutajatunnus"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Sisesta nõuetele vastav parool"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Kasutajanimi on juba kasutuses"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index b82c481cf3e..031b5521718 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,24 +22,24 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Sisestatud sobimatu väärtus %s jaoks"
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Salvestatud"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "testi e-posti seadeid"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "Kui said selle kirja, siis on seadistus korrektne."
 
 #: admin/controller.php:94
 msgid ""
 "A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus."
 
 #: admin/controller.php:99
 msgid "Email sent"
@@ -47,26 +47,26 @@ 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 ""
+msgstr "Pead seadistama oma e-postienne kui on võimalik saata test-kirju."
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
-msgstr ""
+msgstr "Saatmise viis"
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Krüpteerimine"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
-msgstr ""
+msgstr "Autentimise meetod"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "App Store'i nimekirja laadimine ebaõnnestus"
 
 #: 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 "Autentimise viga"
 
@@ -128,38 +128,38 @@ msgstr "Kasutajat ei saa eemaldada grupist %s"
 msgid "Couldn't update app."
 msgstr "Rakenduse uuendamine ebaõnnestus."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Vale parool"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Kasutajat ei sisestatud"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti."
 
-#: 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 "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Ei suuda parooli muuta"
 
 #: js/admin.js:73
 msgid "Sending..."
-msgstr ""
+msgstr "Saadan..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -167,7 +167,7 @@ msgstr "Kasutaja dokumentatsioon"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Admin dokumentatsioon"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -205,7 +205,7 @@ msgstr "Viga rakenduse uuendamisel"
 msgid "Error"
 msgstr "Viga"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Uuenda"
 
@@ -213,31 +213,31 @@ msgstr "Uuenda"
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Vali profiili pilt"
 
 #: js/personal.js:274
 msgid "Very weak password"
-msgstr ""
+msgstr "Väga nõrk parool"
 
 #: js/personal.js:275
 msgid "Weak password"
-msgstr ""
+msgstr "Nõrk parool"
 
 #: js/personal.js:276
 msgid "So-so password"
-msgstr ""
+msgstr "Enam-vähem sobiv parool"
 
 #: js/personal.js:277
 msgid "Good password"
-msgstr ""
+msgstr "Hea parool"
 
 #: js/personal.js:278
 msgid "Strong password"
-msgstr ""
+msgstr "Väga hea parool"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega."
 
@@ -286,7 +286,7 @@ msgstr "Sisesta nõuetele vastav parool"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -320,32 +320,32 @@ msgstr "Logi sisse"
 
 #: templates/admin.php:18
 msgid "Plain"
-msgstr ""
+msgstr "Tavatekst"
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "NT LAN Manager"
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Turvahoiatus"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "Sa kasutad %s ligipääsuks HTTP protokolli. Soovitame tungivalt seadistada oma server selle asemel kasutama HTTPS-i."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -354,68 +354,68 @@ msgid ""
 "root."
 msgstr "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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Paigalduse hoiatus"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Moodul 'fileinfo' puudub"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "PHP versioon on aegunud"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalisatsioon ei toimi"
 
-#: templates/admin.php:119
+#: 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:123
+#: 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:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s."
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internetiühendus ei toimi"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -424,162 +424,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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Cron käivitati viimati %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 käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron pole kordagi käivitatud!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Käivita toiming igal lehe laadimisel"
 
-#: templates/admin.php:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Jagamine"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Luba Share API"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Luba rakendustel kasutada Share API-t"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Luba lingid"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Luba avalikud üleslaadimised"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Luba edasijagamine"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Luba kasutajatel kõigiga jagada"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Luba teavitused e-postiga"
 
-#: templates/admin.php:235
+#: 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:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Turvalisus"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Sunni peale HTTPS-i kasutamine"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
-msgstr ""
+msgstr "Postiserver"
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "Seda kasutatakse teadete välja saatmiseks."
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
-msgstr ""
+msgstr "Saatja aadress"
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
-msgstr ""
+msgstr "Autentimine on vajalik"
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Serveri aadress"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Kasutajatunnused"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP kasutajatunnus"
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP parool"
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
-msgstr ""
+msgstr "Testi e-posti seadeid"
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
-msgstr ""
+msgstr "Saada kiri"
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Vähem"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +613,23 @@ msgstr "Lisa oma rakendus"
 msgid "More Apps"
 msgstr "Veel rakendusi"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Vali programm"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "Dokumentatsioon:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
-msgstr ""
+msgstr "Vaata rakendi veebilehte"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>"
 
@@ -650,108 +666,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Parool"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Sinu parooli on muudetud"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Sa ei saa oma parooli muuta"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Praegune parool"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Uus parool"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Täispikk nimi"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
-msgstr ""
+msgstr "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist."
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profiili pilt"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Laadi uus üles"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Vali failidest uus"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Eemalda pilt"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Sinu avatari pakub sinu algne konto."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Loobu"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Vali profiilipildiks"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Sisselogimise parool"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Dekrüpteeri kõik failid"
 
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index a05bf02b3fd..01175efd2a3 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -3,14 +3,14 @@
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -165,7 +165,7 @@ msgstr "Abiinfo"
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
 msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+msgstr "Kriteeriumiga sobivad grupid on saadaval %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -201,7 +201,7 @@ msgstr "gruppi leitud"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Logimiseks kasutatkse atribuuti: "
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -269,7 +269,7 @@ msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaar
 #: templates/part.wizard-userfilter.php:4
 #, php-format
 msgid "Limit %s access to users meeting these criteria:"
-msgstr ""
+msgstr "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -413,49 +413,60 @@ msgstr "Grupiliikme seotus"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+msgstr "Sisegrupp"
 
 #: templates/settings.php:39
 msgid ""
 "When switched on, groups that contain groups are supported. (Only works if "
 "the group member attribute contains DNs.)"
+msgstr "Sisse lülitamisel on toetatakse gruppe sisaldavad gruppe. (Toimib, kui grupi liikme atribuut sisaldab DN-e.)"
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Spetsiifilised atribuudid"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Mahupiirangu atribuut"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Vaikimisi mahupiirang"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "baitides"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-posti väli"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Kasutaja kodukataloogi nimetamise reegel"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Sisemine kasutajanimi"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Sisemise kasutajatunnuse atribuut:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Tühista UUID tuvastus"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID atribuut kasutajatele:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID atribuut gruppidele:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 f0316298b39..bbfc2bbca11 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Ezin izan da posta bidali hurrengo erabiltzaileei: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Mantenu modua gaitu da"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Mantenu modua desgaitu da"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -145,63 +136,63 @@ msgstr "Azaroa"
 msgid "December"
 msgstr "Abendua"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Gordetzen..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "orain dela minutu %n"
 msgstr[1] "orain dela %n minutu"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "orain dela ordu %n"
 msgstr[1] "orain dela %n ordu"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "orain dela egun %n"
 msgstr[1] "orain dela %n egun"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "orain dela hilabete %n"
 msgstr[1] "orain dela %n hilabete"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "urte"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr "Fitxategi batek konfliktua sortu du"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Fitxategi Berriak"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Ze fitxategi mantendu nahi duzu?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Jarraitu"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(denak hautatuta)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} hautatuta)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Errorea fitxategia existitzen da txantiloiak kargatzerakoan"
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "Elkarbanatu"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Errorea"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
@@ -418,19 +417,19 @@ msgstr "Pasahitzarekin babestuta"
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Abisua"
 
@@ -544,6 +543,18 @@ msgstr "Pasahitz berria"
 msgid "Reset password"
 msgstr "Berrezarri pasahitza"
 
+#: 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 "Pertsonala"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index f976425fee6..7825ae31939 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -19,48 +19,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Ez da jatorri baliogarria"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa"
@@ -70,74 +70,74 @@ msgstr "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbit
 msgid "Error while downloading %s to %s"
 msgstr "Errorea %s %sra deskargatzerakoan"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Errorea karpeta sortzerakoan"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Ezin da igoera direktorioa ezarri."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Lekuko baliogabea"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Aldi bateko karpeta falta da"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
@@ -158,92 +158,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ezin da zerbitzaritik emaitzik lortu"
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URLa ezin da hutsik egon"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Etxeko (home) karpetan 'Shared' erreserbatutako fitxategi izena da"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Ezin izan da fitxategia sortu"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Ezin izan da karpeta sortu"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Errorea URLa eskuratzerakoan"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Errorea fitxategia mugitzean"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Errorea"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Ezin izan da fitxategia berrizendatu"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr " {new_name}-k {old_name} ordezkatu du"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "desegin"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Errorea fitxategia ezabatzerakoan."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "karpeta %n"
 msgstr[1] "%n karpeta"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "fitxategi %n"
 msgstr[1] "%n fitxategi"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} eta {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Fitxategi %n igotzen"
@@ -280,29 +280,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Errorea fitxategia mugitzean"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Errorea"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Aldatuta"
 
@@ -310,113 +302,109 @@ msgstr "Aldatuta"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Baliogabeako karpeta izena. 'Shared' izena erreserbatuta dago."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ezin da berrizendatu"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Igo"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Fitxategien kudeaketa"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Igo daitekeen gehienezko tamaina"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max, posiblea:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Beharrezkoa fitxategi-anitz eta karpeten deskargarako."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Gaitu ZIP-deskarga"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 mugarik gabe esan nahi du"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP fitxategien gehienezko tamaina"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Berria"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Testu fitxategi berria"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Testu fitxategia"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Karpeta berria"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Karpeta"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Estekatik"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Ezabatutako fitxategiak"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Igoera handiegia da"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/eu/files_external.po
index 4fb61478a37..5d1aca46839 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua"
 msgid "Error configuring Google Drive storage"
 msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Abisua:</b> Curl euskarri PHP modulua ez dago instalatuta edo gaitua. Ezinezko da ownCloud /WebDAV GoogleDrive-n muntatzea. Mesedez eskatu sistema kudeatzaileari instala dezan. "
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Kanpoko Biltegiratzea"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Karpetaren izena"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Kanpoko biltegiratzea"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Aukerak"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplikagarria"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Gehitu biltegiratzea"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ezarri gabe"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Erabiltzaile guztiak"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL erro ziurtagiriak"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Inportatu Erro Ziurtagiria"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index cb55fbd589f..6c379c48627 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -67,23 +67,23 @@ msgstr "Baliogabeko irudia"
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP deskarga ez dago gaituta."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -194,8 +194,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %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 "Existitzen den kontu bat edo administradorearena jarri behar duzu."
 
@@ -208,9 +208,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 "DB errorea: \"%s\""
@@ -219,9 +219,9 @@ msgstr "DB errorea: \"%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 "Errorea komando honek sortu du: \"%s\""
@@ -257,7 +257,7 @@ msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %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 erabiltzaile edota pasahitza ez dira egokiak."
 
@@ -269,19 +269,19 @@ msgstr "Ezarri administraziorako erabiltzaile izena."
 msgid "Set an admin password."
 msgstr "Ezarri administraziorako pasahitza."
 
-#: private/setup.php:198
+#: 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 "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s-ek »%s« zurekin partekatu du"
@@ -338,3 +338,21 @@ msgstr "joan den urtean"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "urte"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Baliozko erabiltzaile izena eman behar da"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Baliozko pasahitza eman behar da"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Erabiltzaile izena dagoeneko erabiltzen ari da"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 52e13339ba8..136a7c70e61 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -50,15 +50,15 @@ msgstr "Eposta bidalia"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgid "Unable to load list from App Store"
 msgstr "Ezin izan da App Dendatik zerrenda kargatu"
 
 #: 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 "Autentifikazio errorea"
 
@@ -129,32 +129,32 @@ msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
 msgid "Couldn't update app."
 msgstr "Ezin izan da aplikazioa eguneratu."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Pasahitz okerra"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Ez da erabiltzailerik zehaztu"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Mesedez eman berreskuratzeko administrazio  pasahitza, bestela erabiltzaile datu guztiak galduko dira"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Berreskuratze administradore pasahitz ez egokia. Medesez egiaztatu pasahitza eta saiatu berriz."
 
-#: 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 "Ezin izan da pasahitza aldatu"
 
@@ -206,7 +206,7 @@ msgstr "Errorea aplikazioa eguneratzen zen bitartean"
 msgid "Error"
 msgstr "Errorea"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Eguneratu"
 
@@ -214,7 +214,7 @@ msgstr "Eguneratu"
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Profil argazkia aukeratu"
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -287,7 +287,7 @@ msgstr "Baliozko pasahitza eman behar da"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -335,18 +335,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "%s HTTP bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -355,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Konfiguratu Abisuak"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "'fileinfo' Modulua falta da"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Zure PHP bertsioa zaharkituta dago"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokala ez dabil"
 
-#: templates/admin.php:119
+#: 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:123
+#: 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:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Interneteko konexioak ez du funtzionatzen"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -425,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Partekatzea"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Gaitu Elkarbanatze APIa"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Baimendu loturak"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Baimendu igoera publikoak"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Baimendu birpartekatzea"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Baimendu posta bidezko jakinarazpenak"
 
-#: templates/admin.php:235
+#: 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:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Behartu HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Zerbitzariaren helbidea"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Portua"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Kredentzialak"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -598,23 +614,23 @@ msgstr "Gehitu zure aplikazioa"
 msgid "More Apps"
 msgstr "App gehiago"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Ikusi programen orria apps.owncloud.com en"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
 
@@ -651,108 +667,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Zere pasahitza aldatu da"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Ezin izan da zure pasahitza aldatu"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Uneko pasahitza"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Izena"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilaren irudia"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Igo berria"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Hautatu berria Fitxategietatik"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Irudia ezabatu"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Profil irudi bezala aukeratu"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Saioa hasteko pasahitza"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Desenkripattu fitxategi guztiak"
 
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 0a00e89e649..2b4fbff486d 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -420,41 +420,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atributu Bereziak"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kuota Eremua"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Kuota Lehenetsia"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Eposta eremua"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Barneko erabiltzaile izena"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Baliogabeko Erabiltzaile Izen atributua"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Gainidatzi UUID antzematea"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Erabiltzaileentzako UUID atributuak:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Taldeentzako UUID atributuak:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index d985c0fe9db..767e8da8b59 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 "Pertsonala"
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index b553d1d7336..ee74198632a 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: eu_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 ""
 
-#: 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/eu_ES/files_external.po b/l10n/eu_ES/files_external.po
index 2795b2e5299..dbc51914a58 100644
--- a/l10n/eu_ES/files_external.po
+++ b/l10n/eu_ES/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
index f24e2561ea6..73af4f395d6 100644
--- a/l10n/eu_ES/lib.po
+++ b/l10n/eu_ES/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 5e11f9b23ca..4aa0c3e54f7 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index 20c3e494dba..8e28c9a6557 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 439a8dac8b2..c90f3f0654d 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,59 +135,59 @@ msgstr "نوامبر"
 msgid "December"
 msgstr "دسامبر"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "در حال ذخیره سازی..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "سال‌های قبل"
 
@@ -234,32 +225,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "فایل های جدید"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "منصرف شدن"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -292,11 +291,11 @@ msgid "Share"
 msgstr "اشتراک‌گذاری"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "خطا"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "خطا درحال به اشتراک گذاشتن"
 
@@ -412,19 +411,19 @@ msgstr "نگهداری از رمز عبور"
 msgid "Error unsetting expiration date"
 msgstr "خطا در تنظیم نکردن تاریخ انقضا "
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "خطا در تنظیم تاریخ انقضا"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "درحال ارسال ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "ایمیل ارسال شد"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "اخطار"
 
@@ -538,6 +537,18 @@ 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 "شخصی"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 4671434af3a..4d0ab7becaa 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -19,48 +19,48 @@ 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 نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. "
 
-#: 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "نام پرونده نمی تواند خالی باشد."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -70,74 +70,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "قادر به تنظیم پوشه آپلود نمی باشد."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "رمز نامعتبر"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است."
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "هیچ پروندهای بارگذاری نشده"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "فضای کافی در دسترس نیست"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "فهرست راهنما نامعتبر می باشد."
 
@@ -158,90 +158,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "حذف قطعی"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "خطا"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "در حال بارگذاری %n فایل"
@@ -277,29 +277,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "تاریخ"
 
@@ -307,113 +299,109 @@ msgstr "تاریخ"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s نمیتواند تغییر نام دهد."
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "بارگزاری"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "اداره پرونده ها"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "حداکثر اندازه بارگزاری"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "حداکثرمقدارممکن:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "احتیاج پیدا خواهد شد برای چند پوشه و پرونده"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "فعال سازی بارگیری پرونده های فشرده"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 نامحدود است"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "حداکثرمقدار برای بار گزاری پرونده های فشرده"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "ذخیره"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "جدید"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "فایل متنی"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "پوشه جدید"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "پوشه"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "از پیوند"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "فایل های حذف شده"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "اینجا هیچ چیز نیست."
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "بهبود فایل سیستمی ذخیره گاه..."
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 639992e1199..f5d47a10677 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "لطفا یک کلید و کد امنیتی صحیح دراپ باکس �
 msgid "Error configuring Google Drive storage"
 msgstr "خطا به هنگام تنظیم فضای Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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 امکان پذیر نمیباشد. لطفا از مدیریت سازمان خود برای راه اندازی آن درخواست نمایید."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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کنید."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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 "خطا: پشتیبانی Curl  فعال نمی باشد یا نصب نشده است. نصب و راه اندازی  ownCloud / WebDAV یا GoogleDrive امکان پذیر نیست. لطفا از مدیر سیستم خود برای نصب آن درخواست کنید."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "حافظه خارجی"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "نام پوشه"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "حافظه خارجی"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "پیکربندی"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "تنظیمات"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "قابل اجرا"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "اضافه کردن حافظه"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "تنظیم نشده"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "تمام کاربران"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "گروه ها"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "کاربران"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "فعال سازی حافظه خارجی کاربر"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "گواهی های اصلی SSL "
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "وارد کردن گواهی اصلی"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index fa7f91fd3c2..2f2c29cb563 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -66,23 +66,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "سرویس های تحت وب در کنترل شما"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "دانلود به صورت فشرده غیر فعال است"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "فایل ها باید به صورت یکی یکی دانلود شوند"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "بازگشت به فایل ها"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "نام کاربری و / یا رمزعبور MS SQL معتبر نیست:  %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید."
 
@@ -207,9 +207,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "خطای پایگاه داده: \"%s\""
@@ -218,9 +218,9 @@ msgstr "خطای پایگاه داده: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "دستور متخلف عبارت است از: \"%s\""
@@ -256,7 +256,7 @@ msgstr "نام کاربری و / یا رمزعبور اراکل معتبر نی�
 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,19 +268,19 @@ msgstr "یک نام کاربری برای مدیر تنظیم نمایید."
 msgid "Set an admin password."
 msgstr "یک رمزعبور برای مدیر تنظیم نمایید."
 
-#: private/setup.php:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
@@ -333,3 +333,21 @@ msgstr "سال قبل"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "سال‌های قبل"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "نام کاربری صحیح باید وارد شود"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "رمز عبور صحیح باید وارد شود"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 4fe707b5ddc..f963e25c9aa 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -50,15 +50,15 @@ msgstr "ایمیل ارسال شد"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "رمزگذاری"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -67,7 +67,7 @@ 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 "خطا در اعتبار سنجی"
 
@@ -129,32 +129,32 @@ msgstr "امکان حذف کاربر از گروه %s نیست"
 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 "نمی‌توان رمز را تغییر داد"
 
@@ -206,7 +206,7 @@ msgstr "خطا در هنگام بهنگام سازی برنامه"
 msgid "Error"
 msgstr "خطا"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "به روز رسانی"
 
@@ -214,7 +214,7 @@ msgstr "به روز رسانی"
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "انتخاب تصویر پروفایل"
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد."
 
@@ -287,7 +287,7 @@ msgstr "رمز عبور صحیح باید وارد شود"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -335,18 +335,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -355,68 +355,68 @@ msgid ""
 "root."
 msgstr "به احتمال زیاد پوشه‌ی data و فایل‌های شما از طریق اینترنت قابل دسترسی هستند. فایل .htaccess برنامه کار نمی‌کند. ما شدیداً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که پوشه‌ی data شما غیر قابل دسترسی باشد یا اینکه پوشه‌‎ی data را به خارج از ریشه‌ی اصلی وب سرور انتقال دهید."
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "هشدار راه اندازی"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "ماژول 'fileinfo' از کار افتاده"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "زبان محلی کار نمی کند."
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "اتصال اینترنت کار نمی کند"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -425,162 +425,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید."
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "زمانبند"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "از سرویس کرون سرور استفاده شده است که فایل cron.php را هر 15 دقیقه یک بار فراخوانی کند."
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "اشتراک گذاری"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "فعال کردن API اشتراک گذاری"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "اجازه ی لینک ها"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "اجازه بارگذاری عمومی"
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "به کاربران اجازه داده شود که امکان بارگذاری در پوشه هایی که بصورت عمومی به اشتراک گذاشته اند را برای سایرین فعال سازند"
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "مجوز اشتراک گذاری مجدد"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "اجازه به کابران برای اشتراک گذاری با همه"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "مجاز نمودن اطلاع رسانی توسط ایمیل"
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "مجاز نمودن ارسال ایمیل توسط کاربر برای فایل‌های به اشتراک گذاشته شده"
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "امنیت"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "وادار کردن HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند."
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "آدرس سرور"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "درگاه"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "اعتبارهای"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "سطح ورود"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "کم‌تر"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -598,23 +614,23 @@ msgstr "برنامه خود را بیافزایید"
 msgid "More Apps"
 msgstr "برنامه های بیشتر"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "یک برنامه انتخاب کنید"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "صفحه این اٌپ را در apps.owncloud.com ببینید"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-مجاز از طرف <span class=\"author\"></span>"
 
@@ -651,108 +667,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "رمز عبور شما تغییر یافت"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "ناتوان در تغییر گذرواژه"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "گذرواژه کنونی"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "گذرواژه جدید"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "تغییر گذر واژه"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "نام کامل"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "ایمیل"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "پست الکترونیکی شما"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "تصویر پروفایل"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "بارگذاری جدید"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "انتخاب جدید از میان فایل ها"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "تصویر پاک شود"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "هردوی jpg و png ها مربع گونه می‌باشند. با این حال شما می‌توانید آنها را برش بزنید."
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "منصرف شدن"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "یک تصویر پروفایل انتخاب کنید"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "زبان"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "به ترجمه آن کمک کنید"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "رمز ورود"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "تمام فایلها رمزگشایی شود"
 
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 8311efcf667..1a904629e87 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -418,41 +418,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "ویژگی های مخصوص"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "سهمیه بندی انجام نشد."
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "سهمیه بندی پیش فرض"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "در بایت"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "ایمیل ارسال نشد."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "قانون نامگذاری پوشه خانه کاربر"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD."
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "نام کاربری داخلی"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -468,15 +479,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "ویژگی نام کاربری داخلی:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "نادیده گرفتن تشخیص UUID "
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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,19 +498,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "نام کاربری - نگاشت کاربر LDAP "
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -513,10 +524,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "پاک کردن نام کاربری- LDAP  نگاشت کاربر "
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "پاک کردن نام گروه -LDAP گروه نقشه برداری"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index dce24a5f3a2..bca5b27b15c 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:00+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 08: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"
@@ -20,36 +20,27 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Päättymispäivä on menneisyydessä."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Siirrytty ylläpitotilaan"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Ylläpitotila laitettu pois päältä"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -146,63 +137,63 @@ msgstr "marraskuu"
 msgid "December"
 msgstr "joulukuu"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuutti sitten"
 msgstr[1] "%n minuuttia sitten"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n tunti sitten"
 msgstr[1] "%n tuntia sitten"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n päivä sitten"
 msgstr[1] "%n päivää sitten"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n kuukausi sitten"
 msgstr[1] "%n kuukautta sitten"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "vuotta sitten"
 
@@ -241,32 +232,40 @@ msgid "One file conflict"
 msgstr "Yhden tiedoston ristiriita"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Uudet tiedostot"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr "Jo olemassa olevat tiedostot"
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Mitkä tiedostot haluat säilyttää?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Peru"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Jatka"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(kaikki valittu)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} valittu)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Virhe ladatessa mallipohjaa"
 
@@ -299,11 +298,11 @@ msgid "Share"
 msgstr "Jaa"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Virhe"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
@@ -419,19 +418,19 @@ msgstr "Salasanasuojattu"
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa eräpäivää"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Virhe päättymispäivää asettaessa"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Lähetetään..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Sähköposti lähetetty"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Varoitus"
 
@@ -545,6 +544,18 @@ msgstr "Uusi salasana"
 msgid "Reset password"
 msgstr "Palauta salasana"
 
+#: 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 ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!"
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Henkilökohtainen"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 1001b8b3cb2..94f8bbbdf85 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:50+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -20,48 +20,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" on virheellinen tiedostonimi."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
 msgstr "Kohdekansio on siirretty tai poistettu."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Virheellinen lähde"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -71,74 +71,74 @@ msgstr "Palvelimen ei ole lupa avata verkko-osoitteita. Tarkista palvelimen aset
 msgid "Error while downloading %s to %s"
 msgstr "Virhe ladatessa kohdetta %s sijaintiin %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Virhe kansiota luotaessa"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Lähetyskansion asettaminen epäonnistui."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Tiedoston lähetys onnistui vain osittain"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Yhtäkään tiedostoa ei lähetetty"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Tilapäiskansio puuttuu"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Levylle kirjoitus epäonnistui"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
@@ -159,92 +159,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Tuloksien saaminen palvelimelta ei onnistunut."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "Osoite ei voi olla tyhjä"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Tiedoston luominen epäonnistui"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Kansion luominen epäonnistui"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Virhe noutaessa verkko-osoitetta"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Jaa"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Virhe tiedostoa siirrettäessä"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Virhe"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Tiedoston nimeäminen uudelleen epäonnistui"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "kumoa"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Virhe tiedostoa poistaessa."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kansio"
 msgstr[1] "%n kansiota"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tiedosto"
 msgstr[1] "%n tiedostoa"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} ja {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lähetetään %n tiedosto"
@@ -281,29 +281,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Virhe tiedostoa siirrettäessä"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Virhe"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Muokattu"
 
@@ -311,113 +303,109 @@ msgstr "Muokattu"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Virheellinen kansion nimi. 'Shared':n käyttö on varattu."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "kohteen %s nimeäminen uudelleen epäonnistui"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Lähetä"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Tiedostonhallinta"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Lähetettävän tiedoston suurin sallittu koko"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "suurin mahdollinen:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Tarvitaan useampien tiedostojen ja kansioiden latausta varten."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Ota ZIP-paketin lataaminen käytöön"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 on rajoittamaton"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP-tiedostojen enimmäiskoko"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Tallenna"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Uusi"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Uusi tekstitiedosto"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Uusi kansio"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Kansio"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Linkistä"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Poistetut tiedostot"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/fi_FI/files_external.po
index 920aee5528f..2ed2462b962 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:50+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 12:30+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"
@@ -38,91 +38,100 @@ msgstr "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus."
 msgid "Error configuring Google Drive storage"
 msgstr "Virhe Google Drive levyn asetuksia tehtäessä"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Tallennettu"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Huomio:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr "ja"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Erillinen tallennusväline"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Kansion nimi"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Ulkoinen tallennustila"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Valinnat"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Sovellettavissa"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Saatavuus"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Lisää tallennustila"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ei asetettu"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Ei käyttäjää tai ryhmää"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Kaikki käyttäjät"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Ota käyttöön ulkopuoliset tallennuspaikat"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL-juurivarmenteet"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Tuo juurivarmenne"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 3091572a280..68427d6e24a 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:00+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 12:20+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -66,23 +66,23 @@ msgstr "Virheellinen kuva"
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu käytöstä."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittäin."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
@@ -207,9 +207,9 @@ msgstr "MySQL/MariaDB-käyttäjätunnus ja/tai salasana on virheellinen"
 #: 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 "Tietokantavirhe: \"%s\""
@@ -218,9 +218,9 @@ msgstr "Tietokantavirhe: \"%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 ""
@@ -256,7 +256,7 @@ msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
 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 "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin"
 
@@ -268,19 +268,19 @@ 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:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s jakoi kohteen »%s« kanssasi"
@@ -337,3 +337,21 @@ msgstr "viime vuonna"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "vuotta sitten"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Vain seuraavat merkit ovat sallittuja käyttäjätunnuksessa: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Anna kelvollinen käyttäjätunnus"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Anna kelvollinen salasana"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Käyttäjätunnus on jo käytössä"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index d98d93147a6..12029fb7fc9 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 11:00+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Sähköposti lähetetty"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Lähetystila"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Salaus"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Tunnistautumistapa"
 
@@ -65,7 +65,7 @@ msgid "Unable to load list from App Store"
 msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (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 "Tunnistautumisvirhe"
 
@@ -127,32 +127,32 @@ msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu"
 msgid "Couldn't update app."
 msgstr "Sovelluksen päivitys epäonnistui."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Väärä salasana"
 
-#: 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 "Salasanan vaihto ei onnistunut"
 
@@ -204,7 +204,7 @@ msgstr "Virhe sovellusta päivittäessä"
 msgid "Error"
 msgstr "Virhe"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Päivitä"
 
@@ -212,7 +212,7 @@ msgstr "Päivitä"
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Valitse profiilikuva"
 
@@ -236,7 +236,7 @@ msgstr "Hyvä salasana"
 msgid "Strong password"
 msgstr "Vahva salasana"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa."
 
@@ -285,7 +285,7 @@ msgstr "Anna kelvollinen salasana"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
@@ -428,157 +428,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Käytä jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Salli linkit"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Salli julkiset lähetykset"
 
-#: templates/admin.php:212
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Salli uudelleenjakaminen"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Salli sähköposti-ilmoitukset"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Tietoturva"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Pakota HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Sähköpostipalvelin"
 
-#: templates/admin.php:281
+#: 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:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Lähettäjän osoite"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Tunnistautuminen vaaditaan"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Portti"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Tilitiedot"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP-käyttäjätunnus"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP-salasana"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Testaa sähköpostiasetukset"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Lähetä sähköpostiviesti"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Enemmän"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Vähemmän"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "Lisää sovelluksesi"
 msgid "More Apps"
 msgstr "Lisää sovelluksia"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Valitse sovellus"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Ohjeistus:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Lue lisää sovelluksen sivustolta"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>"
 
@@ -649,108 +665,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Salasanasi vaihdettiin"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Salasanaasi ei voitu vaihtaa"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Sähköpostiosoite"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Sähköpostiosoitteesi"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profiilikuva"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Lähetä uusi"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Valitse uusi tiedostoista"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Poista kuva"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Peru"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Valitse profiilikuvaksi"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Auta kääntämisessä"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Pura kaikkien tiedostojen salaus"
 
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 750a7b58534..4bd3ca6c6ae 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "tavuissa"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Sähköpostikenttä"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index b26ffd4ad51..c36deca9604 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 16:21+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 11:40+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"
@@ -25,36 +25,27 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "La date d'expiration est dans le passé."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Impossible d'envoyer un mail aux utilisateurs suivant : %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Basculé en mode maintenance"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Basculé en mode production (non maintenance)"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -151,127 +142,135 @@ msgstr "novembre"
 msgid "December"
 msgstr "décembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Enregistrement..."
 
-#: js/js.js:995
+#: js/js.js:1099
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:996
+#: js/js.js:1100
 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:997
+#: js/js.js:1101
 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:998
+#: js/js.js:1102
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:999
+#: js/js.js:1103
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:1000
+#: js/js.js:1104
 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:1001
+#: js/js.js:1105
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:1002
+#: js/js.js:1106
 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:1003
+#: js/js.js:1107
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:1004
+#: js/js.js:1108
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:1005
+#: js/js.js:1109
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:125
 msgid "Choose"
 msgstr "Choisir"
 
-#: js/oc-dialogs.js:146
+#: js/oc-dialogs.js:151
 msgid "Error loading file picker template: {error}"
 msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:177
 msgid "Yes"
 msgstr "Oui"
 
-#: js/oc-dialogs.js:182
+#: js/oc-dialogs.js:187
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:199
+#: js/oc-dialogs.js:204
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:219
+#: js/oc-dialogs.js:224
 msgid "Error loading message template: {error}"
 msgstr "Erreur de chargement du modèle de message : {error}"
 
-#: js/oc-dialogs.js:347
+#: js/oc-dialogs.js:352
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} fichier en conflit"
 msgstr[1] "{count} fichiers en conflit"
 
-#: js/oc-dialogs.js:361
+#: js/oc-dialogs.js:366
 msgid "One file conflict"
 msgstr "Un conflit de fichier"
 
-#: js/oc-dialogs.js:367
+#: js/oc-dialogs.js:372
+msgid "New Files"
+msgstr "Nouveaux fichiers"
+
+#: js/oc-dialogs.js:373
+msgid "Already existing files"
+msgstr "Fichiers déjà existants"
+
+#: js/oc-dialogs.js:375
 msgid "Which files do you want to keep?"
 msgstr "Quels fichiers désirez-vous garder ?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:376
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:384
 msgid "Cancel"
 msgstr "Annuler"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:394
 msgid "Continue"
 msgstr "Poursuivre"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
 msgid "(all selected)"
 msgstr "(tous sélectionnés)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:457
 msgid "({count} selected)"
 msgstr "({count} sélectionnés)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:465
 msgid "Error loading file exists template"
 msgstr "Erreur de chargement du modèle de fichier existant"
 
@@ -303,12 +302,12 @@ msgstr "Partagé"
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erreur"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:787
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
@@ -372,71 +371,71 @@ msgstr "Partager via e-mail :"
 msgid "No people found"
 msgstr "Aucun utilisateur trouvé"
 
-#: js/share.js:324 js/share.js:363
+#: js/share.js:324 js/share.js:383
 msgid "group"
 msgstr "groupe"
 
-#: js/share.js:335
+#: js/share.js:355
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisé"
 
-#: js/share.js:379
+#: js/share.js:399
 msgid "Shared in {item} with {user}"
 msgstr "Partagé dans {item} avec {user}"
 
-#: js/share.js:401
+#: js/share.js:421
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:409
+#: js/share.js:429
 msgid "notify by email"
 msgstr "Notifier par email"
 
-#: js/share.js:412
+#: js/share.js:432
 msgid "can edit"
 msgstr "édition autorisée"
 
-#: js/share.js:414
+#: js/share.js:434
 msgid "access control"
 msgstr "contrôle des accès"
 
-#: js/share.js:417
+#: js/share.js:437
 msgid "create"
 msgstr "créer"
 
-#: js/share.js:420
+#: js/share.js:440
 msgid "update"
 msgstr "mettre à jour"
 
-#: js/share.js:423
+#: js/share.js:443
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:426
+#: js/share.js:446
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:698
+#: js/share.js:718
 msgid "Password protected"
 msgstr "Protégé par un mot de passe"
 
-#: js/share.js:711
+#: js/share.js:731
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:723
+#: js/share.js:749
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
-#: js/share.js:742
+#: js/share.js:774
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:753
+#: js/share.js:785
 msgid "Email sent"
 msgstr "Email envoyé"
 
-#: js/share.js:777
+#: js/share.js:809
 msgid "Warning"
 msgstr "Attention"
 
@@ -550,6 +549,18 @@ msgstr "Nouveau mot de passe"
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
+#: 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 n'est pas supporté et %s ne fonctionnera pas correctement sur cette plateforme. Son utilisation est à vos risques et périls !"
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Pour des résultats meilleurs encore, pensez à utiliser un serveur GNU/Linux à la place."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personnel"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 4003c9d9909..fcf0cda1b06 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +22,48 @@ 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:57 js/files.js:98
+#: 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
+#: 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:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "La source n'est pas valide"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -73,74 +73,74 @@ msgstr "Le serveur n'est pas autorisé à ouvrir des URL, veuillez vérifier la
 msgid "Error while downloading %s to %s"
 msgstr "Erreur pendant le téléchargement de %s à %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Erreur pendant la création du dossier"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Impossible de définir le dossier pour l'upload, charger."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Jeton non valide"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été envoyé. Erreur inconnue"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Aucune erreur, le fichier a été envoyé avec succès."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier n'a été que partiellement envoyé."
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "L'envoi a échoué. Impossible de trouver le fichier envoyé."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
@@ -161,92 +161,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Envoi annulé."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "L'URL ne peut pas être vide"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Impossible de créer le fichier"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Impossible de créer le dossier"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Erreur d'accès à l'URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Partager"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Supprimer de façon définitive"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Erreur lors du déplacement du fichier"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Erreur"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "En attente"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Impossible de renommer le fichier"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} a été remplacé par {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "annuler"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Erreur pendant la suppression du fichier."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dossier"
 msgstr[1] "%n dossiers"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fichier"
 msgstr[1] "%n fichiers"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} et {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Téléversement de %n fichier"
@@ -283,29 +283,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Erreur lors du déplacement du fichier"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Erreur"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modifié"
 
@@ -313,113 +305,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ne peut être renommé"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Envoyer"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Gestion des fichiers"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Taille max. d'envoi"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "Max. possible :"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Nécessaire pour le téléchargement de plusieurs fichiers et de dossiers."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Activer le téléchargement ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 est illimité"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Taille maximale pour les fichiers ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nouveau"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nouveau fichier texte"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Fichier texte"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Depuis le lien"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Fichiers supprimés"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Téléversement trop volumineux"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/fr/files_external.po
index 975c937c62a..a7cb6164419 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:
+# timelord <bruno@timelord.fr>, 2014
 # Christophe Lherieau <skimpax@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 15:59+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 12:00+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"
@@ -38,91 +39,100 @@ msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de pas
 msgid "Error configuring Google Drive storage"
 msgstr "Erreur lors de la configuration du support de stockage Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Sauvegarder"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Attention :</b>"
+
+#: lib/config.php:602
+msgid " and "
+msgstr "et"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s 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 de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Stockage externe"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nom du dossier"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Stockage externe"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuration"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Options"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Disponible"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Disponible pour"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Ajouter un support de stockage"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Aucun spécifié"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Aucun utilisateur ou groupe"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Tous les utilisateurs"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Activer le stockage externe pour les utilisateurs"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Autorise les utilisateurs à monter les stockage externes suivants"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificats racine SSL"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importer un certificat racine"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 32cac2cbdb8..f556076b575 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/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-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 15:59+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 11:50+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"
@@ -69,23 +69,23 @@ msgstr "Image invalide"
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Téléchargement ZIP désactivé."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Les fichiers nécessitent d'être téléchargés un par un."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -271,19 +271,19 @@ 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:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s partagé »%s« avec vous"
@@ -340,3 +340,21 @@ msgstr "l'année dernière"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "il y a plusieurs années"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Un nom d'utilisateur valide doit être saisi"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Un mot de passe valide doit être saisi"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Le nom d'utilisateur est déjà utilisé"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 74d558daff5..364745b1f33 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 16:21+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -58,15 +58,15 @@ msgstr "Email envoyé"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Mode d'envoi"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
@@ -75,7 +75,7 @@ msgid "Unable to load list from App Store"
 msgstr "Impossible de charger la liste depuis l'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 "Erreur d'authentification"
 
@@ -137,32 +137,32 @@ msgstr "Impossible de supprimer l'utilisateur du groupe %s"
 msgid "Couldn't update app."
 msgstr "Impossible de mettre à jour l'application"
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Mot de passe incorrect"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Aucun utilisateur fourni"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau."
 
-#: 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 "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."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Impossible de modifier le mot de passe"
 
@@ -214,7 +214,7 @@ msgstr "Erreur lors de la mise à jour de l'application"
 msgid "Error"
 msgstr "Erreur"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Mettre à jour"
 
@@ -222,31 +222,31 @@ msgstr "Mettre à jour"
 msgid "Updated"
 msgstr "Mise à jour effectuée avec succès"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Selectionner une photo de profil "
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Mot de passe de très faible sécurité"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Mot de passe de faible sécurité"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "Mot de passe de sécurité tout juste acceptable"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Mot de passe de sécurité suffisante"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Mot de passe de forte sécurité"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Déchiffrement en cours... Cela peut prendre un certain temps."
 
@@ -295,7 +295,7 @@ msgstr "Un mot de passe valide doit être saisi"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Français"
 
@@ -438,157 +438,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Le dernier cron s'est exécuté à %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 "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Le cron n'a pas encore été exécuté !"
+
+#: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Partage"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activer l'API de partage"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Autoriser les applications à utiliser l'API de partage"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Autoriser les liens"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Autoriser les téléversements publics"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Autoriser le repartage"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Autoriser les utilisateurs à partager avec tout le monde"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Autoriser les notifications par couriel"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sécurité"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forcer HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Serveur mail"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Ceci est utilisé pour l'envoi des notifications."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Adresse source"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Authentification requise"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adresse du serveur"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Informations d'identification"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Nom d'utilisateur SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Mot de passe SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Paramètres de test d'e-mail"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Envoyer un e-mail"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Niveau de log"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -606,23 +622,23 @@ msgstr "Ajoutez votre application"
 msgid "More Apps"
 msgstr "Plus d'applications…"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Sélectionner une Application"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentation :"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Voir le site web de l'application"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>"
 
@@ -659,108 +675,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Votre mot de passe a été changé"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Impossible de changer votre mot de passe"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Adresse mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Photo de profil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Télécharger nouveau"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Sélectionner un nouveau depuis les documents"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Supprimer l'image"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer."
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Votre avatar est fourni par votre compte original."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Choisir en temps que photo de profil "
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Mot de passe de connexion"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Déchiffrer tous les fichiers"
 
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 44203b8b95d..fb2c06ad2d8 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 16:21+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 12:40+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"
@@ -147,7 +147,7 @@ msgstr[1] "%s utilisateurs trouvés"
 msgid "Invalid Host"
 msgstr "Hôte invalide"
 
-#: lib/wizard.php:963
+#: lib/wizard.php:983
 msgid "Could not find the desired feature"
 msgstr "Impossible de trouver la fonction souhaitée"
 
@@ -422,41 +422,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Dimensionnement des paginations"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Attributs spéciaux"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Champ du quota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Quota par défaut"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Champ Email"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Convention de nommage du répertoire utilisateur"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nom d'utilisateur interne"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -472,15 +483,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Nom d'utilisateur interne:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Surcharger la détection d'UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Attribut UUID pour les utilisateurs :"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Attribut UUID pour les groupes :"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -517,10 +528,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 4f7c1524a6e..cc4a62b68dd 100644
--- a/l10n/fr_CA/core.po
+++ b/l10n/fr_CA/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/fr_CA/files.po b/l10n/fr_CA/files.po
index 345fad56c83..72448b63f63 100644
--- a/l10n/fr_CA/files.po
+++ b/l10n/fr_CA/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: fr_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 ""
 
-#: 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/fr_CA/files_external.po b/l10n/fr_CA/files_external.po
index adbbd6c0afd..04acd06d67a 100644
--- a/l10n/fr_CA/files_external.po
+++ b/l10n/fr_CA/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/fr_CA/lib.po b/l10n/fr_CA/lib.po
index 5ecda615508..e00186eb0cb 100644
--- a/l10n/fr_CA/lib.po
+++ b/l10n/fr_CA/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po
index 700d1798806..845f2fc237a 100644
--- a/l10n/fr_CA/settings.po
+++ b/l10n/fr_CA/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/fr_CA/user_ldap.po b/l10n/fr_CA/user_ldap.po
index e513ed6934f..193204b8c23 100644
--- a/l10n/fr_CA/user_ldap.po
+++ b/l10n/fr_CA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 1791618bf16..5d2b05c829b 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 09:40+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 11:00+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "A data de caducidade está no pasado."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Non é posíbel enviar correo aos usuarios seguintes: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Modo de mantemento activado"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Modo de mantemento 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 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"
@@ -145,63 +136,63 @@ msgstr "novembro"
 msgid "December"
 msgstr "decembro"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Gardando..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "hai %n minuto"
 msgstr[1] "hai %n minutos"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "hai %n hora"
 msgstr[1] "hai %n horas"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "hai %n día"
 msgstr[1] "hai %n días"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "último mes"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "hai %n mes"
 msgstr[1] "hai %n meses"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr "Un conflito de ficheiro"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Ficheiros novos"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr "Ficheiros xa existentes"
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Que ficheiros quere conservar?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(todo o seleccionado)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "Compartir"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
@@ -418,19 +417,19 @@ msgstr "Protexido con contrasinal"
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Correo enviado"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Aviso"
 
@@ -544,6 +543,18 @@ msgstr "Novo contrasinal"
 msgid "Reset password"
 msgstr "Restabelecer o contrasinal"
 
+#: 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 non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!"
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index b598f3836bd..24d81be8934 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/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-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 09:10+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -19,48 +19,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "«%s» é un nome incorrecto de ficheiro."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Esta orixe non é correcta"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -70,74 +70,74 @@ msgstr "O servidor non ten permisos para abrir os enderezos URL, comprobe a conf
 msgid "Error while downloading %s to %s"
 msgstr "Produciuse un erro ao descargar %s en %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Produciuse un erro ao crear o cartafol"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Non é posíbel configurar o directorio de envíos."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Marca incorrecta"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se enviou ningún ficheiro. Produciuse un erro descoñecido."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Non houbo erros, o ficheiro enviouse correctamente"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro so foi parcialmente enviado"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Non se enviou ningún ficheiro"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Falta o cartafol temporal"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Produciuse un erro ao escribir no disco"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Non hai espazo de almacenamento abondo"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "O envío fracasou. Non foi posíbel atopar o ficheiro enviado"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 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:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
@@ -158,92 +158,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "O URL non pode quedar en branco."
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "«Shared» dentro do cartafol persoal é un nome reservado"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Non foi posíbel crear o ficheiro"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Non foi posíbel crear o cartafol"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Produciuse un erro ao obter o URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Produciuse un erro ao mover o ficheiro"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Erro"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Non foi posíbel renomear o ficheiro"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "substituír {new_name} por {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "desfacer"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Produciuse un erro ao eliminar o ficheiro."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartafol"
 msgstr[1] "%n cartafoles"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
 msgstr[1] "%n ficheiros"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} e {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Cargando %n ficheiro"
@@ -280,29 +280,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Produciuse un erro ao mover o ficheiro"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Erro"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
@@ -310,113 +302,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s non pode cambiar de nome"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Enviar"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Manexo de ficheiro"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Tamaño máximo do envío"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "máx. posíbel: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Precísase para a descarga de varios ficheiros e cartafoles."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Activar a descarga ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 significa ilimitado"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo de descarga para os ficheiros ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Gardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Ficheiro novo de texto"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Novo cartafol"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Cartafol"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Desde a ligazón"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Cancelar o envío"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí non hai nada. Envíe algo."
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/gl/files_external.po
index 6d0edfcf682..cdc233fcea0 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 09:10+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 07: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"
@@ -38,91 +38,100 @@ msgstr "Forneza unha chave correcta e segreda do Dropbox."
 msgid "Error configuring Google Drive storage"
 msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Gardado"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Nota:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr "e"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Almacenamento externo"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nome do cartafol"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Almacenamento externo"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opcións"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplicábel"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Dispoñíbel para"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Engadir almacenamento"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ningún definido"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Non hai usuario ou grupo"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Todos os usuarios"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Activar o almacenamento externo do usuario"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Permitirlle aos usuarios montar o seguinte almacenamento externo"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificados SSL root"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importar o certificado root"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index d923ae3966d..c112809faad 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 09:20+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 07:30+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"
@@ -67,23 +67,23 @@ msgstr "Imaxe incorrecta"
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP están desactivadas."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -269,19 +269,19 @@ msgstr "Estabeleza un nome de usuario administrador"
 msgid "Set an admin password."
 msgstr "Estabeleza un contrasinal de administrador"
 
-#: private/setup.php:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s compartiu «%s» con vostede"
@@ -338,3 +338,21 @@ msgstr "último ano"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "anos atrás"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Só se permiten os seguintes caracteres no nome de usuario: «a-z», «A-Z», «0-9», e «_.@-»"
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Debe fornecer un nome de usuario"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Debe fornecer un contrasinal"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Este nome de usuario xa está a ser usado"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 07f76320782..c89f5caaf81 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 09:50+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "Correo enviado"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Modo de envío"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -66,7 +66,7 @@ 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"
 
@@ -128,32 +128,32 @@ 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"
 
@@ -205,7 +205,7 @@ msgstr "Produciuse un erro mentres actualizaba o aplicativo"
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Actualizar"
 
@@ -213,31 +213,31 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Seleccione unha imaxe para o perfil"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Contrasinal moi feble"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Contrasinal feble"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "Contrasinal non moi aló"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Bo contrasinal"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Contrasinal forte"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando ficheiros... isto pode levar un anaco."
 
@@ -286,7 +286,7 @@ msgstr "Debe fornecer un contrasinal"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Aviso: O directorio persoal para o usuario «{user}» xa existe"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Galego"
 
@@ -429,157 +429,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartindo"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activar o API para compartir"
 
-#: templates/admin.php:195
+#: 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:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir ligazóns"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir os envíos públicos"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir compartir"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os usuarios compartan con calquera"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir o envío de notificacións por correo"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguranza"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Servidor de correo"
 
-#: templates/admin.php:281
+#: 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:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Desde o enderezo"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Requírese autenticación"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Porto"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Nome de usuario SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Contrasinal SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Correo de proba dos axustes"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Enviar o correo"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Rexistro"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Máis"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +613,23 @@ msgstr "Engada o seu aplicativo"
 msgid "More Apps"
 msgstr "Máis aplicativos"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Escolla un aplicativo"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentación:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Consulte a páxina do aplicativo en apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Vexa o sitio web do aplicativo"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>"
 
@@ -650,108 +666,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "O seu contrasinal foi cambiado"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Non é posíbel cambiar o seu contrasinal"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Imaxe do perfil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Novo envío"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Seleccione unha nova de ficheiros"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Retirar a imaxe"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "O seu avatar é fornecido pola súa conta orixinal."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Escolla unha imaxe para o perfil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Contrasinal de acceso"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Descifrar todos os ficheiros"
 
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 56d17fa56b4..f9723ef2270 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 09:10+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 11:00+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Tamaño dos fragmentos paxinados"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Tamaño dos fragmentos utilizados para as buscas LDAP paxinadas, que poden devolver resultados voluminosos como usuario ou enumeración de grupo. (Se se establece a 0, desactívanse as buscas LDAP paxinadas nesas situacións.)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Campo de cota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Cota predeterminada"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Campo do correo"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Regra de nomeado do cartafol do usuario"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nome de usuario interno"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atributo do nome de usuario interno:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Ignorar a detección do UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Atributo do UUID para usuarios:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo do UUID para grupos:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación do usuario ao «nome de usuario LDAP»"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 81a10302c0d..0179be12db3 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -145,63 +136,63 @@ msgstr "נובמבר"
 msgid "December"
 msgstr "דצמבר"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "שמירה…"
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "לפני %n דקה"
 msgstr[1] "לפני %n דקות"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "לפני %n שעה"
 msgstr[1] "לפני %n שעות"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "היום"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "אתמול"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "לפני %n יום"
 msgstr[1] "לפני %n ימים"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "לפני %n חודש"
 msgstr[1] "לפני %n חודשים"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "חודשים"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "שנים"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "קבצים חדשים"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "ביטול"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "שתף"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "שגיאה במהלך השיתוף"
 
@@ -418,19 +417,19 @@ msgstr "מוגן בססמה"
 msgid "Error unsetting expiration date"
 msgstr "אירעה שגיאה בביטול תאריך התפוגה"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "מתבצעת שליחה ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "הודעת הדוא״ל נשלחה"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "אזהרה"
 
@@ -544,6 +543,18 @@ 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 "אישי"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 42fec934471..082677ed42c 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -19,48 +19,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "שם קובץ אינו יכול להיות ריק"
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -70,74 +70,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "לא הועלה קובץ. טעות בלתי מזוהה."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "לא התרחשה שגיאה, הקובץ הועלה בהצלחה"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "הקובץ הועלה באופן חלקי בלבד"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "שום קובץ לא הועלה"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "תקיה זמנית חסרה"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "הכתיבה לכונן נכשלה"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "אין די שטח פנוי באחסון"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "העלאה נכשלה. לא ניתן להשיג את פרטי הקובץ."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "תיקייה שגויה."
 
@@ -158,92 +158,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "לא ניתן לגשת לתוצאות מהשרת."
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "שתף"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "מחק לצמיתות"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "שגיאה"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} הוחלף ב־{old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "ביטול"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -280,29 +280,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "זמן שינוי"
 
@@ -310,113 +302,109 @@ msgstr "זמן שינוי"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "העלאה"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "טיפול בקבצים"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "גודל העלאה מקסימלי"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "המרבי האפשרי: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "נחוץ להורדה של ריבוי קבצים או תיקיות."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "הפעלת הורדת ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 - ללא הגבלה"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "גודל הקלט המרבי לקובצי ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "שמירה"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "חדש"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "קובץ טקסט"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "תיקייה"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "מקישור"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "קבצים שנמחקו"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "הקבצים נסרקים, נא להמתין."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 913a0768eeb..8b8cb74a276 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "נא לספק קוד יישום וסוד תקניים של Dropbox."
 msgid "Error configuring Google Drive storage"
 msgstr "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "אחסון חיצוני"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "שם התיקייה"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "הגדרות"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "אפשרויות"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "ניתן ליישום"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "לא הוגדרה"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "כל המשתמשים"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "קבוצות"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "משתמשים"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "הפעלת אחסון חיצוני למשתמשים"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "שורש אישורי אבטחת SSL "
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "ייבוא אישור אבטחת שורש"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index c019c598f31..98e02d70405 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "שירותי רשת תחת השליטה שלך"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "הורדת ZIP כבויה"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "יש להוריד את הקבצים אחד אחרי השני."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "חזרה לקבצים"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "הקבצים הנבחרים גדולים מידי ליצירת קובץ zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s שיתף/שיתפה איתך את »%s«"
@@ -336,3 +336,21 @@ msgstr "שנה שעברה"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "שנים"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "יש לספק שם משתמש תקני"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "יש לספק ססמה תקנית"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 0d4becb93cf..1fa7bd0336e 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -48,15 +48,15 @@ msgstr "הודעת הדוא״ל נשלחה"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Unable to load list from App Store"
 msgstr "לא ניתן לטעון רשימה מה־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 "שגיאת הזדהות"
 
@@ -127,32 +127,32 @@ msgstr "לא ניתן להסיר משתמש מהקבוצה %s"
 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 ""
 
@@ -204,7 +204,7 @@ msgstr "אירעה שגיאה בעת עדכון היישום"
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "עדכון"
 
@@ -212,7 +212,7 @@ msgstr "עדכון"
 msgid "Updated"
 msgstr "מעודכן"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr "יש לספק ססמה תקנית"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "עברית"
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "אזהרת אבטחה"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "שגיאת הגדרה"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "המודול „fileinfo“ חסר"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "החיבור לאינטרנט אינו פעיל"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "שיתוף"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "הפעלת API השיתוף"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "לאפשר ליישום להשתמש ב־API השיתוף"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "לאפשר קישורים"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "לאפשר למשתמשים לשתף פריטים "
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "לאפשר שיתוף מחדש"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "לאפשר למשתמשים לשתף עם כל אחד"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "אבטחה"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "לאלץ HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "כתובת שרת"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "פורט"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "פרטי גישה"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "רמת הדיווח"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "יותר"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "פחות"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "הוספת היישום שלך"
 msgid "More Apps"
 msgstr "יישומים נוספים"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "בחירת יישום"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "צפה בעמוד הישום ב apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>"
 
@@ -649,108 +665,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "סיסמא"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "הססמה שלך הוחלפה"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "לא ניתן לשנות את הססמה שלך"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "ססמה נוכחית"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "ססמה חדשה"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "שינוי ססמה"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "כתובת הדוא״ל שלך"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "תמונת פרופיל"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "ביטול"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "פה"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "עזרה בתרגום"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index e43dba49a7b..761cc4181c9 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -420,41 +420,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "בבתים"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 92da8401610..465201029d5 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -145,63 +136,63 @@ msgstr "नवंबर"
 msgid "December"
 msgstr "दिसम्बर"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "साझा करें"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "त्रुटि"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -418,19 +417,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "भेजा जा रहा है"
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "ईमेल भेज दिया गया है "
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "चेतावनी "
 
@@ -544,6 +543,18 @@ 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 "यक्तिगत"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 5a0c1ce2751..72e81b60380 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "साझा करें"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "त्रुटि"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "अपलोड "
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "सहेजें"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index 9992c8ee119..3f24d3235bd 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index a0e8492a736..955a511e0f0 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 6baf2b2cf7d..9b0da8d64aa 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr "ईमेल भेज दिया गया है "
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "अद्यतन"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "सुरक्षा चेतावनी "
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index f001017d01f..904a9c1fab6 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 66cf63915eb..be6045fb23b 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,67 +134,67 @@ msgstr "Studeni"
 msgid "December"
 msgstr "Prosinac"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Spremanje..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "godina"
 
@@ -243,32 +234,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Odustani"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -301,11 +300,11 @@ msgid "Share"
 msgstr "Podijeli"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Greška"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Greška prilikom djeljenja"
 
@@ -421,19 +420,19 @@ msgstr "Zaštita lozinkom"
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -547,6 +546,18 @@ msgstr "Nova lozinka"
 msgid "Reset password"
 msgstr "Poništavanje lozinke"
 
+#: 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 "Osobno"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 5348b43b4a5..8af768de1fb 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +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/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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema pogreške, datoteka je poslana uspješno."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslana datoteka je parcijalno poslana"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Datoteka nije poslana"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremeni direktorij"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Neuspjelo pisanje na disk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,94 +156,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Greška"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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 "vrati"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -281,29 +281,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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 "Greška"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Zadnja promjena"
 
@@ -311,113 +303,109 @@ msgstr "Zadnja promjena"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Učitaj"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "datoteka za rukovanje"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimalna veličina prijenosa"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maksimalna moguća: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Potrebno za preuzimanje više datoteke i mape"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Omogući ZIP-preuzimanje"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 je \"bez limita\""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimalna veličina za ZIP datoteke"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Snimi"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "tekstualna datoteka"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "mapa"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pričekajte."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index b93a5ef818f..9dab6b27fd5 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Korisnici"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index e9e53e47186..27e93095437 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -340,3 +340,21 @@ msgstr "prošlu godinu"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "godina"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 45cdc0d2f91..c1b59f382cd 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "više"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index c5facc60a29..110b3e10c6c 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 1c3c267efd4..d9b058d9412 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -20,36 +20,27 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, 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"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "A karbantartási mód bekapcsolva"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "A karbantartási mód kikapcsolva"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -146,63 +137,63 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Mentés..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n perccel ezelőtt"
 msgstr[1] "%n perccel ezelőtt"
 
-#: js/js.js:997
+#: js/js.js:1126
 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:998
+#: js/js.js:1127
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n nappal ezelőtt"
 msgstr[1] "%n nappal ezelőtt"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:1002
+#: js/js.js:1131
 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:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "több hónapja"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "több éve"
 
@@ -241,32 +232,40 @@ msgid "One file conflict"
 msgstr "Egy file ütközik"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Új fájlok"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Melyik file-okat akarod megtartani?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Folytatás"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(all selected)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} kiválasztva)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Hiba a létező sablon betöltésekor"
 
@@ -299,11 +298,11 @@ msgid "Share"
 msgstr "Megosztás"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Hiba"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Nem sikerült létrehozni a megosztást"
 
@@ -419,19 +418,19 @@ msgstr "Jelszóval van védve"
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerült a lejárati időt törölni"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Nem sikerült a lejárati időt beállítani"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Küldés ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Az emailt elküldtük"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
@@ -545,6 +544,18 @@ msgstr "Az új jelszó"
 msgid "Reset password"
 msgstr "Jelszó-visszaállítás"
 
+#: 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 "Személyes"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index c46c0f9cfce..96f91fea063 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -19,48 +19,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "A kiinduló állomány érvénytelen"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -70,74 +70,74 @@ msgstr "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőri
 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:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Hiba történt a mappa létrehozásakor"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Nem található a mappa, ahova feltölteni szeretne."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Hibás mappacím"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem történt feltöltés. Ismeretlen hiba"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "A fájlt sikerült feltölteni"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nem töltődött fel állomány"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Hiányzik egy ideiglenes mappa"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Nem sikerült a lemezre történő írás"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nincs elég szabad hely."
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 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:166
+#: ajax/upload.php:169
 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:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
@@ -158,92 +158,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "Az URL-cím nem maradhat kitöltetlenül"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Az állomány nem hozható létre"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "A mappa nem hozható létre"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "A megadott URL-ről nem sikerül adatokat kapni"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Végleges törlés"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Az állomány áthelyezése nem sikerült."
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Hiba"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Az állomány nem nevezhető át"
 
-#: 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:591
-msgid "undo"
-msgstr "visszavonás"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Hiba a file törlése közben."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappa"
 msgstr[1] "%n mappa"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n állomány"
 msgstr[1] "%n állomány"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} és {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n állomány feltöltése"
@@ -280,29 +280,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Az állomány áthelyezése nem sikerült."
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Hiba"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Módosítva"
 
@@ -310,113 +302,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s átnevezése nem sikerült"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Fájlkezelés"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximális feltölthető fájlméret"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. lehetséges: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Kötegelt fájl- vagy mappaletöltéshez szükséges"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "A ZIP-letöltés engedélyezése"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 = korlátlan"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP-fájlok maximális kiindulási mérete"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Új"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Új szöveges file"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Szövegfájl"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Új mappa"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Feltöltés linkről"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Törölt fájlok"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "A feltöltés megszakítása"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. Töltsön fel valamit!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "A feltöltés túl nagy"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 
-#: templates/index.php:108
+#: templates/index.php:106
 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 99e10dc725a..1623bca0543 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -6,13 +6,14 @@
 # blackc0de <complic@vipmail.hu>, 2013
 # ebela <bela@dandre.hu>, 2013
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
+# osztraksajt <osztraksajt@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-03 01:55-0400\n"
+"PO-Revision-Date: 2014-04-02 20:30+0000\n"
+"Last-Translator: osztraksajt <osztraksajt@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -104,7 +105,7 @@ msgstr "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltartha
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Kezedeti titkosítás fut... Próbálja később."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
@@ -114,91 +115,91 @@ msgstr "Ugrás ide:"
 msgid "personal settings"
 msgstr "személyes beállítások"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "A helyreállítási kulcs jelszava"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Ismételje meg a helyreállítási kulcs jelszavát"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Bekapcsolva"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Kikapcsolva"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "A helyreállítási kulcs jelszavának módosítása:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Régi Helyreállítási Kulcs Jelszava"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Új Helyreállítási kulcs jelszava"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Ismételje meg az új helyreállítási kulcs jelszavát"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "A személyes kulcs jelszava mostantól nem azonos a belépési jelszavával:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Állítsuk be a személyes kulcs jelszavát a jelenlegi bejelentkezési jelszavunkra."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Régi bejelentkezési jelszó"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Jelenlegi bejelentkezési jelszó"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "A személyest kulcs jelszó frissítése"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Jelszó-visszaállítás bekapcsolása"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "A fájlhelyreállítási beállítások frissültek"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "A fájlhelyreállítás nem frissíthető"
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 469445c3371..3ef34c0ef50 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Adjon meg egy érvényes Dropbox app key-t és secretet!"
 msgid "Error configuring Google Drive storage"
 msgstr "A Google Drive tárolót nem sikerült beállítani"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Figyelmeztetés:</b> A PHP-ben nincs telepítve vagy engedélyezve a Curl támogatás. Nem lehetséges ownCloud / WebDAV ill. GoogleDrive tárolók becsatolása. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot!"
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Külső tárolási szolgáltatások becsatolása"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Mappanév"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Külső tárolók"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Beállítások"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opciók"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Érvényességi kör"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Tároló becsatolása"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nincs beállítva"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Az összes felhasználó"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Csoportok"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Felhasználók"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 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
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL tanúsítványok"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "SSL tanúsítványok importálása"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 875d728f202..858b0c42ef8 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -68,23 +68,23 @@ msgstr "Hibás kép"
 msgid "web services under your control"
 msgstr "webszolgáltatások saját kézben"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "A ZIP-letöltés nincs engedélyezve."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "A fájlokat egyenként kell letölteni."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Vissza a Fájlokhoz"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "A kiválasztott fájlok túl nagyok a zip tömörítéshez."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -195,8 +195,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %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 "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia"
 
@@ -209,9 +209,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 "Adatbázis hiba: \"%s\""
@@ -220,9 +220,9 @@ msgstr "Adatbázis hiba: \"%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 hibát ez a parancs okozta: \"%s\""
@@ -258,7 +258,7 @@ msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %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 "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen"
 
@@ -270,19 +270,19 @@ 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:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s megosztotta Önnel ezt:  »%s«"
@@ -339,3 +339,21 @@ msgstr "tavaly"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "több éve"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Érvényes felhasználónevet kell megadnia"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Érvényes jelszót kell megadnia"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Ez a bejelentkezési név már foglalt"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 1ddf13827a8..e0457774ded 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -51,15 +51,15 @@ msgstr "Az emailt elküldtük"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -68,7 +68,7 @@ msgid "Unable to load list from App Store"
 msgstr "Nem tölthető le a lista az App Store-ból"
 
 #: 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 "Azonosítási hiba"
 
@@ -130,32 +130,32 @@ msgstr "A felhasználó nem távolítható el ebből a csoportból: %s"
 msgid "Couldn't update app."
 msgstr "A program frissítése nem sikerült."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Hibás jelszó"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Nincs felhasználó által mellékelve"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Add meg az admin helyreállító jelszót, máskülönben az összes felhasználói adat elveszik."
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra."
 
-#: 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 back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Nem sikerült megváltoztatni a jelszót"
 
@@ -207,7 +207,7 @@ msgstr "Hiba történt a programfrissítés közben"
 msgid "Error"
 msgstr "Hiba"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Frissítés"
 
@@ -215,7 +215,7 @@ msgstr "Frissítés"
 msgid "Updated"
 msgstr "Frissítve"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Válassz profil képet"
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 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 ..."
 
@@ -288,7 +288,7 @@ msgstr "Érvényes jelszót kell megadnia"
 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:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -336,18 +336,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Biztonsági figyelmeztetés"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "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:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -356,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "A beállítással kapcsolatos figyelmeztetés"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "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:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "A 'fileinfo' modul hiányzik"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "A PHP verzió túl régi"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "A nyelvi lokalizáció nem működik"
 
-#: templates/admin.php:119
+#: 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:123
+#: 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:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "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:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Az internet kapcsolat nem működik"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -426,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Ütemezett feladatok"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Megosztás"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "A megosztás API-jának engedélyezése"
 
-#: templates/admin.php:191
+#: 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:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Linkek engedélyezése"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Feltöltést engedélyezése mindenki számára"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "A továbbosztás engedélyezése"
 
-#: templates/admin.php:217
+#: 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:224
+#: 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:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "E-mail értesítések engedélyezése"
 
-#: templates/admin.php:235
+#: 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:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Biztonság"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Kötelező HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "A kiszolgáló címe"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Azonosítók"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Naplózás"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Naplózási szint"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Több"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -599,23 +615,23 @@ msgstr "Az alkalmazás hozzáadása"
 msgid "More Apps"
 msgstr "További alkalmazások"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Válasszon egy alkalmazást"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Lásd apps.owncloud.com, alkalmazások oldal"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>"
 
@@ -652,108 +668,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "A jelszava megváltozott"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "A jelszó nem változtatható meg"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "A jelenlegi jelszó"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Az új jelszó"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "A jelszó megváltoztatása"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Teljes név"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Az Ön email címe"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilkép"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Új feltöltése"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Új kiválasztása Fileokból"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Kép eltávolítása"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 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:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Válassz profil képet"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Segítsen a fordításban!"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Bejelentkezési jelszó"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Kititkosítja az összes file-t"
 
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index a199ced0ec6..47568fd0f88 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Különleges attribútumok"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kvóta mező"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Alapértelmezett kvóta"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "bájtban"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Email mező"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "A home könyvtár elérési útvonala"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Belső felhasználónév"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "A belső felhasználónév attribútuma:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Az UUID-felismerés felülbírálása"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "A felhasználók UUID attribútuma:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "A csoportok UUID attribútuma:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Felhasználó - LDAP felhasználó hozzárendelés"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "A felhasználó - LDAP felhasználó hozzárendelés törlése"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 38e96911df4..92b8b8c3854 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr "Նոյեմբեր"
 msgid "December"
 msgstr "Դեկտեմբեր"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index a9436217933..83025c434df 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Պահպանել"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Բեռնել"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 10f068d6123..5d5b3cfe323 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index b81e6dd42c9..d62bc683e0c 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index a791585c30a..5d2492a437c 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index eeb36900227..21b936379d0 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 51d7fa2a3a4..b2feb59e742 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr "Compartir"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ msgstr "Nove contrasigno"
 msgid "Reset password"
 msgstr "Reinitialisar contrasigno"
 
+#: 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 "Personal"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 2417161d134..caded4be34c 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le file incargate solmente esseva incargate partialmente"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate."
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Error"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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 "Error"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificate"
 
@@ -308,113 +300,109 @@ msgstr "Modificate"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Incargar"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Dimension maxime de incargamento"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Salveguardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nove"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "File de texto"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index 2ead0f4a734..6397e610907 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Gruppos"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Usatores"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 9304e0a8417..c6eea0497d2 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index afd2ca20c0c..e3e14d2e0b2 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "Actualisar"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 593db01cf1d..6109e27e981 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index f237c9fe53d..27d4c0d4a70 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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,36 +17,27 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Tidak dapat mengirim Email ke pengguna berikut: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Hidupkan mode perawatan"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Matikan mode perawatan"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -143,59 +134,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n menit yang lalu"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n jam yang lalu"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n hari yang lalu"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n bulan yang lalu"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr "Satu berkas konflik"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Berkas mana yang ingin anda pertahankan?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Batal"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Lanjutkan"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(semua terpilih)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} terpilih)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Galat memuat templat berkas yang sudah ada"
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr "Bagikan"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Galat"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Galat ketika membagikan"
 
@@ -411,19 +410,19 @@ msgstr "Sandi dilindungi"
 msgid "Error unsetting expiration date"
 msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Galat ketika mengatur tanggal kedaluwarsa"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Mengirim ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email terkirim"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Peringatan"
 
@@ -537,6 +536,18 @@ msgstr "Sandi baru"
 msgid "Reset password"
 msgstr "Atur ulang sandi"
 
+#: 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 "Pribadi"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 1631142feb0..8b63cc4291e 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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +18,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Nama berkas tidak boleh kosong."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Sumber tidak sah"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -69,74 +69,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr "Galat saat mengunduh %s ke %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Galat saat membuat folder"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Tidak dapat mengatur folder unggah"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Token tidak sah"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Tidak ada galat, berkas sukses diunggah"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Berkas hanya diunggah sebagian"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Tidak ada berkas yang diunggah"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Folder sementara tidak ada"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Gagal menulis ke disk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Unggah gagal. Tidak menemukan berkas yang akan diunggah"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Unggah gagal. Tidak mendapatkan informasi berkas."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Direktori tidak valid."
 
@@ -157,90 +157,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Tidak mendapatkan hasil dari server."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL tidak boleh kosong"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Tidak dapat membuat berkas"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Tidak dapat membuat folder"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Hapus secara permanen"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Galat saat memindahkan berkas"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Galat"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Tidak dapat mengubah nama berkas"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "mengganti {new_name} dengan {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "urungkan"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Galat saat menghapus berkas."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n berkas"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} dan {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Mengunggah %n berkas"
@@ -276,29 +276,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Galat saat memindahkan berkas"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Galat"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Dimodifikasi"
 
@@ -306,113 +298,109 @@ msgstr "Dimodifikasi"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nama folder tidak sah. Menggunakan 'Shared' sudah digunakan."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s tidak dapat diubah nama"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Unggah"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Penanganan berkas"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Ukuran pengunggahan maksimum"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "Kemungkinan maks.:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Dibutuhkan untuk pengunduhan multi-berkas dan multi-folder"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Aktifkan unduhan ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 berarti tidak terbatas"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Ukuran masukan maksimum untuk berkas ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Baru"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Berkas teks baru"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Berkas teks"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Map baru"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Dari tautan"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Berkas yang dihapus"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Hapus"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Yang diunggah terlalu besar"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silakan tunggu."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/id/files_external.po
index a74f2ef2c43..e93bf83ccc2 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar."
 msgid "Error configuring Google Drive storage"
 msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Penyimpanan Eksternal"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nama folder"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Penyimpanan eksternal"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opsi"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Berlaku"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Tambahkan penyimpanan"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Tidak satupun di set"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Semua Pengguna"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grup"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Pengguna"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Hapus"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Aktifkan Penyimpanan Eksternal Pengguna"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Sertifikat root SSL"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Impor Sertifikat Root"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 77fcdde6fc7..edf2ae28a7e 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr "Gambar tidak sah"
 msgid "web services under your control"
 msgstr "layanan web dalam kendali anda"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Pengunduhan ZIP dimatikan."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Berkas harus diunduh satu persatu."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Kembali ke Berkas"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nama pengguna dan/atau sandi MySQL tidak sah: %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 "Anda harus memasukkan akun yang sudah ada atau administrator."
 
@@ -206,9 +206,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 "Galat Basis Data: \"%s\""
@@ -217,9 +217,9 @@ msgstr "Galat Basis Data: \"%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 "Perintah yang bermasalah: \"%s\""
@@ -255,7 +255,7 @@ msgstr "Nama pengguna dan/atau sandi Oracle tidak sah"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %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 "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
 
@@ -267,19 +267,19 @@ msgstr "Atur nama pengguna admin."
 msgid "Set an admin password."
 msgstr "Atur sandi admin."
 
-#: private/setup.php:198
+#: 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 "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s membagikan »%s« dengan anda"
@@ -332,3 +332,21 @@ msgstr "tahun kemarin"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "beberapa tahun lalu"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Tuliskan nama pengguna yang valid"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Tuliskan sandi yang valid"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 44b961c268a..551731125a2 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -47,15 +47,15 @@ msgstr "Email terkirim"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgid "Unable to load list from App Store"
 msgstr "Tidak dapat memuat daftar dari 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 "Galat saat autentikasi"
 
@@ -126,32 +126,32 @@ msgstr "Tidak dapat menghapus pengguna dari grup %s"
 msgid "Couldn't update app."
 msgstr "Tidak dapat memperbarui aplikasi."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Sandi salah"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Tidak ada pengguna yang diberikan"
 
-#: 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 "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali."
 
-#: 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 "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Tidak dapat mengubah sandi"
 
@@ -203,7 +203,7 @@ msgstr "Gagal ketika memperbarui aplikasi"
 msgid "Error"
 msgstr "Galat"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Perbarui"
 
@@ -211,7 +211,7 @@ msgstr "Perbarui"
 msgid "Updated"
 msgstr "Diperbarui"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Pilih foto profil"
 
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat."
 
@@ -284,7 +284,7 @@ msgstr "Tuliskan sandi yang valid"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Peringatan Keamanan"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Peringatan Persiapan"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' tidak ada"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Versi PHP telah usang"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Kode pelokalan tidak berfungsi"
 
-#: templates/admin.php:119
+#: 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:123
+#: 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:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s."
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Koneksi internet tidak berfungsi"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Berbagi"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktifkan API Pembagian"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Izinkan tautan"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Izinkan unggahan publik"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Izinkan pembagian ulang"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Izinkan pemberitahuan email"
 
-#: templates/admin.php:235
+#: 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:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Keamanan"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Selalu Gunakan HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Alamat server"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "port"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Catat"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Level pencatatan"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Lainnya"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -595,23 +611,23 @@ msgstr "Tambahkan Aplikasi Anda"
 msgid "More Apps"
 msgstr "Aplikasi Lainnya"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Pilih Aplikasi"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>"
 
@@ -648,108 +664,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Sandi"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Sandi Anda telah diubah"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Gagal mengubah sandi Anda"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Sandi saat ini"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Sandi baru"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Ubah sandi"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Alamat email Anda"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Foto profil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Unggah baru"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Pilih baru dari Berkas"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Hapus gambar"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Avatar disediakan oleh akun asli Anda."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Batal"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Pilih sebagai gambar profil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Sandi masuk"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Deskripsi semua Berkas"
 
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index a8e38b76de2..8317de9115d 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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atribut Khusus"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Bidang Kuota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Kuota Baku"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "dalam bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Bidang Email"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Aturan Penamaan Folder Home Pengguna"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/is/core.po b/l10n/is/core.po
index b9f3932a048..92864f101c9 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,63 +135,63 @@ msgstr "Nóvember"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Er að vista ..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "einhverjum árum"
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr "Deila"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Villa"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Villa við deilingu"
 
@@ -417,19 +416,19 @@ msgstr "Verja með lykilorði"
 msgid "Error unsetting expiration date"
 msgstr "Villa við að aftengja gildistíma"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Villa við að setja gildistíma"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Tölvupóstur sendur"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Aðvörun"
 
@@ -543,6 +542,18 @@ msgstr "Nýtt lykilorð"
 msgid "Reset password"
 msgstr "Endursetja lykilorð"
 
+#: 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 "Um mig"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 9d53e5fa540..bd2bbad19c8 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Engin skrá var send inn. Óþekkt villa."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Engin villa, innsending heppnaðist"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Einungis hluti af innsendri skrá skilaði sér"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Engin skrá skilaði sér"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Vantar bráðabirgðamöppu"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Tókst ekki að skrifa á disk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Deila"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Villa"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "yfirskrifaði {new_name} með {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "afturkalla"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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 "Villa"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Breytt"
 
@@ -308,113 +300,109 @@ msgstr "Breytt"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Senda inn"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Meðhöndlun skrár"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Hámarks stærð innsendingar"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "hámark mögulegt: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Nauðsynlegt til að sækja margar skrár og möppur í einu."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Virkja ZIP niðurhal."
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 er ótakmarkað"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Hámarks inntaksstærð fyrir ZIP skrár"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Vista"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nýtt"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Texta skrá"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Af tengli"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Er að skima"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 27db470770c..5824e83788f 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "Gefðu upp virkan Dropbox lykil og leynikóða"
 msgid "Error configuring Google Drive storage"
 msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Ytri gagnageymsla"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nafn möppu"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Uppsetning"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Stillingar"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Gilt"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ekkert sett"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Allir notendur"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Hópar"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Notendur"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Virkja ytra gagnasvæði notenda"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL rótar skilríki"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Flytja inn rótar skilríki"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index bbb36d90674..24dba8ecb24 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "vefþjónusta undir þinni stjórn"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Slökkt á ZIP niðurhali."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Skrárnar verður að sækja eina og eina"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Aftur í skrár"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "síðasta ári"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "einhverjum árum"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 4c9738adbb7..0d1a019ba82 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -48,15 +48,15 @@ msgstr "Tölvupóstur sendur"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "Dulkóðun"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -212,31 +212,31 @@ msgstr "Uppfæra"
 msgid "Updated"
 msgstr "Uppfært"
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Öryggis aðvörun"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Host nafn netþjóns"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index e0cccdc882d..71cca1d2e03 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -420,41 +420,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 0be4361890d..fa750f66180 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # nappo <leone@inventati.org>, 2013
-# idetao <marcxosm@gmail.com>, 2013
+# idetao <marcxosm@gmail.com>, 2013-2014
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 23:00+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 22:35+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,36 +21,27 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "La data di scadenza è nel passato."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Impossibile inviare email ai seguenti utenti: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Modalità di manutenzione attivata"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Modalità di manutenzione disattivata"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -147,127 +138,135 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Dicembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
-#: js/js.js:995
+#: js/js.js:1099
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:996
+#: js/js.js:1100
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto fa"
 msgstr[1] "%n minuti fa"
 
-#: js/js.js:997
+#: js/js.js:1101
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ora fa"
 msgstr[1] "%n ore fa"
 
-#: js/js.js:998
+#: js/js.js:1102
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:999
+#: js/js.js:1103
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:1000
+#: js/js.js:1104
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n giorno fa"
 msgstr[1] "%n giorni fa"
 
-#: js/js.js:1001
+#: js/js.js:1105
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:1002
+#: js/js.js:1106
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n mese fa"
 msgstr[1] "%n mesi fa"
 
-#: js/js.js:1003
+#: js/js.js:1107
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:1004
+#: js/js.js:1108
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:1005
+#: js/js.js:1109
 msgid "years ago"
 msgstr "anni fa"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:125
 msgid "Choose"
 msgstr "Scegli"
 
-#: js/oc-dialogs.js:146
+#: js/oc-dialogs.js:151
 msgid "Error loading file picker template: {error}"
 msgstr "Errore durante il caricamento del modello del selettore file: {error}"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:177
 msgid "Yes"
 msgstr "Sì"
 
-#: js/oc-dialogs.js:182
+#: js/oc-dialogs.js:187
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:199
+#: js/oc-dialogs.js:204
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:219
+#: js/oc-dialogs.js:224
 msgid "Error loading message template: {error}"
 msgstr "Errore durante il caricamento del modello di messaggio: {error}"
 
-#: js/oc-dialogs.js:347
+#: js/oc-dialogs.js:352
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} file in conflitto"
 msgstr[1] "{count} file in conflitto"
 
-#: js/oc-dialogs.js:361
+#: js/oc-dialogs.js:366
 msgid "One file conflict"
 msgstr "Un file in conflitto"
 
-#: js/oc-dialogs.js:367
+#: js/oc-dialogs.js:372
+msgid "New Files"
+msgstr "File nuovi"
+
+#: js/oc-dialogs.js:373
+msgid "Already existing files"
+msgstr "File già esistenti"
+
+#: js/oc-dialogs.js:375
 msgid "Which files do you want to keep?"
 msgstr "Quali file vuoi mantenere?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:376
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:384
 msgid "Cancel"
 msgstr "Annulla"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:394
 msgid "Continue"
 msgstr "Continua"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
 msgid "(all selected)"
 msgstr "(tutti i selezionati)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:457
 msgid "({count} selected)"
 msgstr "({count} selezionati)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:465
 msgid "Error loading file exists template"
 msgstr "Errore durante il caricamento del modello del file esistente"
 
@@ -299,12 +298,12 @@ msgstr "Condivisi"
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Errore"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:787
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
@@ -368,71 +367,71 @@ msgstr "Condividi tramite email:"
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:324 js/share.js:363
+#: js/share.js:324 js/share.js:383
 msgid "group"
 msgstr "gruppo"
 
-#: js/share.js:335
+#: js/share.js:355
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non è consentita"
 
-#: js/share.js:379
+#: js/share.js:399
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:401
+#: js/share.js:421
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:409
+#: js/share.js:429
 msgid "notify by email"
 msgstr "notifica tramite email"
 
-#: js/share.js:412
+#: js/share.js:432
 msgid "can edit"
 msgstr "può modificare"
 
-#: js/share.js:414
+#: js/share.js:434
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:417
+#: js/share.js:437
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:420
+#: js/share.js:440
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:423
+#: js/share.js:443
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:426
+#: js/share.js:446
 msgid "share"
 msgstr "condividi"
 
-#: js/share.js:698
+#: js/share.js:718
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:711
+#: js/share.js:731
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:723
+#: js/share.js:749
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:742
+#: js/share.js:774
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:753
+#: js/share.js:785
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
-#: js/share.js:777
+#: js/share.js:809
 msgid "Warning"
 msgstr "Avviso"
 
@@ -546,6 +545,18 @@ msgstr "Nuova password"
 msgid "Reset password"
 msgstr "Ripristina la password"
 
+#: 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 non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!"
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 95cfef54cb8..dca986f6c55 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +19,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" non è un nome file valido."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Non è una sorgente valida"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -70,74 +70,74 @@ msgstr "Al server non è permesso aprire URL, controlla la configurazione del se
 msgid "Error while downloading %s to %s"
 msgstr "Errore durante lo scaricamento di %s su %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Errore durante la creazione della cartella"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Impossibile impostare una cartella di caricamento."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Token non valido"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato caricato correttamente"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato caricato solo parzialmente"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nessun file è stato caricato"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Caricamento non riuscito. Impossibile trovare il file caricato."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
@@ -158,92 +158,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Impossibile ottenere il risultato dal server."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "L'URL non può essere vuoto."
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Nella cartella home 'Shared' è un nome riservato"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Impossibile creare il file"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Impossibile creare la cartella"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Errore durante il recupero dello URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Condividi"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Errore durante lo spostamento del file"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Errore"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Impossibile rinominare il file"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "sostituito {new_name} con {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "annulla"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Errore durante l'eliminazione del file."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartella"
 msgstr[1] "%n cartelle"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n file"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} e {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Caricamento di %n file in corso"
@@ -280,29 +280,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Errore durante lo spostamento del file"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Errore"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificato"
 
@@ -310,113 +302,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s non può essere rinominato"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Carica"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Gestione file"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Dimensione massima upload"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "numero mass.: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Necessario per lo scaricamento di file multipli e cartelle."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Abilita scaricamento ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 è illimitato"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Dimensione massima per i file ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Salva"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nuovo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nuovo file di testo"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "File di testo"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Cartella"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Da collegamento"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "File eliminati"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Caricamento troppo grande"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/it/files_external.po
index 861c245c59e..652c7841ce7 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -3,13 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jessica Di Maria <dimariaj87@gmail.com>, 2014
+# idetao <marcxosm@gmail.com>, 2014
 # Paolo Velati <paolo.velati@gmail.com>, 2014
+# Vincenzo Reale <vinx.reale@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 22:47+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 22:40+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -38,91 +41,100 @@ msgstr "Fornisci chiave di applicazione e segreto di Dropbox validi."
 msgid "Error configuring Google Drive storage"
 msgstr "Errore durante la configurazione dell'archivio Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Salvato"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Nota:</b>"
+
+#: lib/config.php:602
+msgid " and "
+msgstr "e"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Archiviazione esterna"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nome della cartella"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Archiviazione esterna"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opzioni"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Applicabile"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Disponibile per"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Aggiungi archiviazione"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nessuna impostazione"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Nessun utente o gruppo"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Tutti gli utenti"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Utenti"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Abilita la memoria esterna dell'utente"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Consenti agli utenti di montare la seguente memoria esterna"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificati SSL radice"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importa certificato radice"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 5675eee56ab..7de4b24e4d4 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Francesco Capuano <francesco@capu.it>, 2013
+# idetao <marcxosm@gmail.com>, 2014
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 22:52+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 22:37+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"
@@ -68,23 +69,23 @@ msgstr "Immagine non valida"
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -195,8 +196,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome utente e/o password MS SQL non validi: %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 "È necessario inserire un account esistente o l'amministratore."
 
@@ -209,9 +210,9 @@ msgstr "Nome utente e/o password di MySQL/MariaDB non validi"
 #: 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 "Errore DB: \"%s\""
@@ -220,9 +221,9 @@ msgstr "Errore 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 "Il comando non consentito era: \"%s\""
@@ -258,7 +259,7 @@ msgstr "Nome utente e/o password di Oracle non validi"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Il comando non consentito era: \"%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 utente e/o password di PostgreSQL non validi"
 
@@ -270,19 +271,19 @@ msgstr "Imposta un nome utente di amministrazione."
 msgid "Set an admin password."
 msgstr "Imposta una password di amministrazione."
 
-#: private/setup.php:198
+#: 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 "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ha condiviso «%s» con te"
@@ -339,3 +340,21 @@ msgstr "anno scorso"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "anni fa"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Solo i seguenti caratteri sono ammessi in un nome utente: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Deve essere fornito un nome utente valido"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Deve essere fornita una password valida"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Il nome utente è già utilizzato"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index c466a063ba4..358818292cb 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/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-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 18:21+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "Email inviata"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Modalità di invio"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
@@ -68,7 +68,7 @@ msgid "Unable to load list from App Store"
 msgstr "Impossibile caricare l'elenco dall'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 "Errore di autenticazione"
 
@@ -130,32 +130,32 @@ msgstr "Impossibile rimuovere l'utente dal gruppo %s"
 msgid "Couldn't update app."
 msgstr "Impossibile aggiornate l'applicazione."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Password errata"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Non è stato fornito alcun utente"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi."
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Password amministrativa di ripristino errata. Controlla la password e prova ancora."
 
-#: 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 "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Impossibile cambiare la password"
 
@@ -207,7 +207,7 @@ msgstr "Errore durante l'aggiornamento"
 msgid "Error"
 msgstr "Errore"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Aggiorna"
 
@@ -215,31 +215,31 @@ msgstr "Aggiorna"
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Seleziona un'immagine del profilo"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Password molto debole"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Password debole"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "Password così-così"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Password buona"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Password forte"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo."
 
@@ -288,7 +288,7 @@ msgstr "Deve essere fornita una password valida"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Avviso: la cartella home dell'utente \"{user}\" esiste già"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -431,157 +431,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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, potrebbe esserci qualche problema."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron non è stato ancora eseguito!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Esegui un'operazione con ogni pagina caricata"
 
-#: templates/admin.php:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Condivisione"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Abilita API di condivisione"
 
-#: templates/admin.php:195
+#: 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:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Consenti collegamenti"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Consenti caricamenti pubblici"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Consenti la ri-condivisione"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Consenti agli utenti di condividere con chiunque"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Consenti le notifiche tramite posta elettronica"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Protezione"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forza HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Server di posta"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Viene utilizzato per inviare le notifiche."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Indirizzo mittente"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Indirizzo del server"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Credenziali"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Nome utente SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Password SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Prova impostazioni email"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Invia email"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Altro"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -599,23 +615,23 @@ msgstr "Aggiungi la tua applicazione"
 msgid "More Apps"
 msgstr "Altre applicazioni"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentazione:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Visita il sito web dell'applicazione"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>"
 
@@ -652,108 +668,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "La tua password è cambiata"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Modifica password non riuscita"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Password attuale"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nuova password"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Posta elettronica"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Immagine del profilo"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Carica nuova"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Seleziona nuova da file"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Rimuovi immagine"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Il tuo avatar è ottenuto dal tuo account originale."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Annulla"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Scegli come immagine del profilo"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Password di accesso"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Decifra tutti i file"
 
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 0f6dbc21554..b7958a71cae 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# idetao <marcxosm@gmail.com>, 2014
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 22:50+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 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"
@@ -146,7 +147,7 @@ msgstr[1] "%s utenti trovati"
 msgid "Invalid Host"
 msgstr "Host non valido"
 
-#: lib/wizard.php:963
+#: lib/wizard.php:983
 msgid "Could not find the desired feature"
 msgstr "Impossibile trovare la funzionalità desiderata"
 
@@ -421,41 +422,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Dimensione del blocco di paginazione"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Dimensione del blocco per le ricerche LDAP paginate che potrebbero restituire risultati pesanti come l'enumerazione di utenti o gruppi.(L'impostazione a 0 disabilita le ricerche LDAP paginate in questi casi.)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Attributi speciali"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Campo Quota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Quota predefinita"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "in byte"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Campo Email"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Regola di assegnazione del nome della cartella utente"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nome utente interno"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +483,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Attributo nome utente interno:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Ignora rilevamento UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +502,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Attributo UUID per gli utenti:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Attributo UUID per i gruppi:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Associazione Nome utente-Utente LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +528,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Cancella associazione Nome utente-Utente LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index 20a5b0e9100..66014893c65 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-11 13:20+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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,36 +23,27 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "有効期限が切れています。"
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "次のユーザーにメールを送信できませんでした: %s"
 
-#: 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 "... %d%% 完了 ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "画像もしくはファイルが提供されていません"
@@ -149,59 +140,59 @@ msgstr "11月"
 msgid "December"
 msgstr "12月"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "保存中..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "数秒前"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分前"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 時間前"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n日前"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "1ヶ月前"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%nヶ月前"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "数ヶ月前"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "1年前"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "数年前"
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr "1ファイルが競合"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "新しいファイル"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "どちらのファイルを保持したいですか？"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "続ける"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(全て選択)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} 選択)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "既存ファイルのテンプレートの読み込みエラー"
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr "共有"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "エラー"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "共有でエラー発生"
 
@@ -417,19 +416,19 @@ msgstr "パスワード保護"
 msgid "Error unsetting expiration date"
 msgstr "有効期限の未設定エラー"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "有効期限の設定でエラー発生"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "送信中..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "メールを送信しました"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "警告"
 
@@ -543,6 +542,18 @@ 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 "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。"
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。"
+
 #: strings.php:5
 msgid "Personal"
 msgstr "個人"
diff --git a/l10n/ja/files.po b/l10n/ja/files.po
index a42d1d2c0e3..0ac2ef5d918 100644
--- a/l10n/ja/files.po
+++ b/l10n/ja/files.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 08:10+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -24,48 +24,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "ファイル名を空にすることはできません。"
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" は無効なファイル名です。"
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。"
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "有効なソースではありません"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。"
@@ -75,74 +75,74 @@ msgstr "サーバーは、URLを開くことは許されません。サーバー
 msgid "Error while downloading %s to %s"
 msgstr "%s から %s へのダウンロードエラー"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "フォルダーの生成エラー"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "アップロードディレクトリを設定できません。"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "無効なトークン"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "ファイルは何もアップロードされていません。不明なエラー"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "アップロードファイルは一部分だけアップロードされました"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "一時保存フォルダーが見つかりません"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "ディスクへの書き込みに失敗しました"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "ストレージに十分な空き容量がありません"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "アップロードに失敗。ファイル情報を取得できませんでした。"
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "無効なディレクトリです。"
 
@@ -163,90 +163,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。"
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "サーバーから結果を取得できませんでした。"
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL は空にできません"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "ホームフォルダーでは、'Shared' はシステムが使用する予約済みのファイル名です"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} はすでに存在します"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "ファイルを作成できませんでした"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "フォルダーを作成できませんでした"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "URL取得エラー"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "共有"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "完全に削除する"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "ファイルの移動エラー"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "エラー"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "中断"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "ファイルの削除エラー。"
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個のフォルダー"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個のファイル"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} と {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個のファイルをアップロード中"
@@ -282,29 +282,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。"
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "更新日時"
 
@@ -312,113 +304,109 @@ msgstr "更新日時"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "無効なフォルダー名。「Shared」の利用は予約されています。"
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%sの名前を変更できませんでした"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "アップロード"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "ファイル操作"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "最大アップロードサイズ"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "最大容量: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "複数ファイルおよびフォルダーのダウンロードに必要"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP形式のダウンロードを有効にする"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0を指定した場合は無制限"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIPファイルでの最大入力サイズ"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "保存"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "新規作成"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "新規のテキストファイル作成"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "テキストファイル"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "新しいフォルダー"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "フォルダー"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "リンク"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "ゴミ箱"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "ここにファイルをアップロードもしくは作成する権限がありません"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "ここには何もありません。何かアップロードしてください。"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "削除"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "アップロードには大きすぎます。"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。"
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "スキャン中"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "ファイルシステムキャッシュを更新中..."
diff --git a/l10n/ja/files_external.po b/l10n/ja/files_external.po
index d7b59ad313b..dbce411329b 100644
--- a/l10n/ja/files_external.po
+++ b/l10n/ja/files_external.po
@@ -5,13 +5,14 @@
 # Translators:
 # plazmism <gomidori@live.jp>, 2014
 # kuromabo <md81bird@hitaki.net>, 2014
+# tt yn <tetuyano+transi@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -39,91 +40,100 @@ msgstr "有効なDropboxアプリのキーとパスワードを入力してく�
 msgid "Error configuring Google Drive storage"
 msgstr "Googleドライブストレージの設定エラー"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "保存されました"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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共有のマウントはできません。システム管理者にインストールを依頼してください。"
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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共有のマウントはできません。システム管理者にインストールを依頼してください。"
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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のマウントはできません。システム管理者にインストールを依頼してください。"
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "外部ストレージ"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "フォルダー名"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "外部ストレージ"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "設定"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "オプション"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "適用範囲"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "ストレージを追加"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "未設定"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "ユーザーもしくはグループがありません"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "すべてのユーザー"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "グループ"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "ユーザー"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "削除"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "ユーザーの外部ストレージを有効にする"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "ユーザに以下の外部ストレージのマウントを許可する"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSLルート証明書"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "ルート証明書をインポート"
diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po
index 07ec0881452..44361df0669 100644
--- a/l10n/ja/lib.po
+++ b/l10n/ja/lib.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -70,23 +70,23 @@ msgstr "無効な画像"
 msgid "web services under your control"
 msgstr "管理下のウェブサービス"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIPダウンロードは無効です。"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "ファイルは1つずつダウンロードする必要があります。"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "ファイルに戻る"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "選択したファイルはZIPファイルの生成には大きすぎます。"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -272,19 +272,19 @@ msgstr "管理者のユーザー名を設定"
 msgid "Set an admin password."
 msgstr "管理者のパスワードを設定。"
 
-#: private/setup.php:198
+#: 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インターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。"
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%sが あなたと »%s«を共有しました"
@@ -337,3 +337,21 @@ msgstr "1年前"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "年前"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "有効なユーザー名を指定する必要があります"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "有効なパスワードを指定する必要があります"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "ユーザ名はすでに使われています"
diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po
index e2383a5ad05..539a9c1e798 100644
--- a/l10n/ja/settings.po
+++ b/l10n/ja/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-12 07:20+0000\n"
-"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -52,15 +52,15 @@ msgstr "メールを送信しました"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。"
 
-#: admin/controller.php:116 templates/admin.php:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "送信モード"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "暗号化"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "認証方法"
 
@@ -69,7 +69,7 @@ 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 "認証エラー"
 
@@ -131,32 +131,32 @@ msgstr "ユーザーをグループ %s から削除できません"
 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 "パスワードを変更できません"
 
@@ -208,7 +208,7 @@ msgstr "アプリの更新中にエラーが発生"
 msgid "Error"
 msgstr "エラー"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "アップデート"
 
@@ -216,31 +216,31 @@ msgstr "アップデート"
 msgid "Updated"
 msgstr "アップデート済み"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "プロファイル画像を選択"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "非常に弱いパスワード"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "弱いパスワード"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "まずまずのパスワード"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "良好なパスワード"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "強いパスワード"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。"
 
@@ -289,7 +289,7 @@ msgstr "有効なパスワードを指定する必要があります"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Japanese (日本語)"
 
@@ -432,157 +432,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています"
 
-#: templates/admin.php:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "共有"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "共有APIを有効にする"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "アプリからの共有APIの利用を許可する"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "リンクを許可する"
 
-#: templates/admin.php:203
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "ユーザーがリンクによりアイテムを公開することを許可する"
 
-#: templates/admin.php:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "パブリックなアップロードを許可"
 
-#: templates/admin.php:212
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可"
 
-#: templates/admin.php:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "再共有を許可する"
 
-#: templates/admin.php:221
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "ユーザーが共有しているアイテムの再共有を許可する"
 
-#: templates/admin.php:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "ユーザーに誰とでも共有することを許可する"
 
-#: templates/admin.php:231
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "ユーザーにグループ内のユーザーとのみ共有を許可する"
 
-#: templates/admin.php:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "メール通知を許可"
 
-#: templates/admin.php:239
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "共有ファイルに関するメール通知の送信をユーザーに許可する"
 
-#: templates/admin.php:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "セキュリティ"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "常にHTTPSを使用する"
 
-#: templates/admin.php:261
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "クライアントから %sへの接続を常に暗号化します。"
 
-#: templates/admin.php:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "メールサーバー"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "これは通知の送信に使われます。"
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "アドレスから"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "要求される認証"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "サーバーアドレス"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "ポート"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "資格情報"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP ユーザー名"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP パスワード"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "メールテスト設定"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "メールを送信"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "もっと見る"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "閉じる"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -600,23 +616,23 @@ msgstr "アプリを追加"
 msgid "More Apps"
 msgstr "さらにアプリを表示"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "アプリを選択してください"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "ドキュメント:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com でアプリケーションのページを見てください"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "アプリケーションのウェブサイトを見る"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>"
 
@@ -653,108 +669,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "パスワードを変更しました"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "パスワードを変更することができません"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Current password"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "新しいパスワードを入力"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "パスワードを変更"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "名前"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "メール"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください"
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "プロフィール写真"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "新規にアップロード"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "ファイルから新規に選択"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "画像を削除"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。"
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。"
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "プロファイル画像として選択"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "言語"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "翻訳に協力する"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください"
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "ログインパスワード"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "すべてのファイルを複合する"
 
diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po
index 879766d023d..3a893d0ed2c 100644
--- a/l10n/ja/user_ldap.po
+++ b/l10n/ja/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "クォータフィールド"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "クォータのデフォルト"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "バイト"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "メールフィールド"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "ユーザーのホームフォルダー命名規則"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ユーザー名を空のままにしてください（デフォルト）。もしくは、LDAPもしくはADの属性を指定してください。"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "内部ユーザー名"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "デフォルトでは、内部ユーザー名はUUID属性から作成されます。これにより、ユーザー名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザー名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザー名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダー名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザー表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザーにおいてのみ有効となります。"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "内部ユーザー名属性:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "UUID検出を再定義する"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザーとLDAPグループに対してのみ有効となります。"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "ユーザーの UUID 属性:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "グループの UUID 属性:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "ユーザー名とLDAPユーザのマッピング"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "ユーザー名とLDAPユーザーのマッピングをクリアする"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "グループ名とLDAPグループのマッピングをクリアする"
diff --git a/l10n/jv/core.po b/l10n/jv/core.po
new file mode 100644
index 00000000000..17dbc1170a8
--- /dev/null
+++ b/l10n/jv/core.po
@@ -0,0 +1,809 @@
+# 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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+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:479
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:564
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1124
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1125
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1126
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1127
+msgid "today"
+msgstr ""
+
+#: js/js.js:1128
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1129
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1130
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1131
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1132
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1133
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1134
+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 "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:379
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:389
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:460
+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: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 ""
+
+#: 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/jv/files.po b/l10n/jv/files.po
new file mode 100644
index 00000000000..010013ec49a
--- /dev/null
+++ b/l10n/jv/files.po
@@ -0,0 +1,408 @@
+# 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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 17:00+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\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:145
+#: 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:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+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:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:107
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:159
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:169
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:184
+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:542
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:546
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:548 js/filelist.js:603
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:600
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:613
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:653
+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:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:630
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:789
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:822
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:1052 js/filelist.js:1090
+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:331
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:570 templates/index.php:67
+msgid "Name"
+msgstr ""
+
+#: js/files.js:571 templates/index.php:79
+msgid "Size"
+msgstr ""
+
+#: js/files.js:572 templates/index.php:81
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:93
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:22
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:5
+msgid "New"
+msgstr ""
+
+#: templates/index.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:51
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:56
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr "Njipuk"
+
+#: templates/index.php:84 templates/index.php:85
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:96
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:98
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:103
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:106
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/jv/files_encryption.po b/l10n/jv/files_encryption.po
new file mode 100644
index 00000000000..8d6649ddda9
--- /dev/null
+++ b/l10n/jv/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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\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:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/jv/files_external.po b/l10n/jv/files_external.po
new file mode 100644
index 00000000000..86d3c6e3eba
--- /dev/null
+++ b/l10n/jv/files_external.po
@@ -0,0 +1,136 @@
+# 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-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\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:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:626
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:628
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/jv/files_sharing.po b/l10n/jv/files_sharing.po
new file mode 100644
index 00000000000..9fedbf7af1e
--- /dev/null
+++ b/l10n/jv/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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:33
+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/jv/files_trashbin.po b/l10n/jv/files_trashbin.po
new file mode 100644
index 00000000000..be9965732a8
--- /dev/null
+++ b/l10n/jv/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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\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:3
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:264
+msgid "Deleted Files"
+msgstr ""
+
+#: lib/trashbin.php:859 lib/trashbin.php:861
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:6
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/jv/files_versions.po b/l10n/jv/files_versions.po
new file mode 100644
index 00000000000..adf7b45d3ed
--- /dev/null
+++ b/l10n/jv/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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/jv/lib.po b/l10n/jv/lib.po
new file mode 100644
index 00000000000..da7f24790c3
--- /dev/null
+++ b/l10n/jv/lib.po
@@ -0,0 +1,356 @@
+# 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-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\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:232
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:233
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:234 private/files.php:262
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:259
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:260
+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:72
+#: private/share/mailnotifications.php:118
+#, 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 ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po
new file mode 100644
index 00000000000..7cba8a701d0
--- /dev/null
+++ b/l10n/jv/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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 17:00+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\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:149
+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:49
+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 "Panjalukan salah"
+
+#: 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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+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:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:243
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:274
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:275
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:276
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:313
+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:48 personal.php:49
+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:171
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 templates/personal.php:174
+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:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:137
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:139
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:157
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:162
+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/jv/user_ldap.po b/l10n/jv/user_ldap.po
new file mode 100644
index 00000000000..2371aadaeb6
--- /dev/null
+++ b/l10n/jv/user_ldap.po
@@ -0,0 +1,534 @@
+# 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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\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:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/jv/user_webdavauth.po b/l10n/jv/user_webdavauth.po
new file mode 100644
index 00000000000..c09af40c57c
--- /dev/null
+++ b/l10n/jv/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-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/ka_GE/core.po b/l10n/ka_GE/core.po
index 9dccaa194ca..734a0cd8b5c 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr "ნოემბერი"
 msgid "December"
 msgstr "დეკემბერი"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "შენახვა..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "წლის წინ"
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "ახალი ფაილები"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "უარყოფა"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr "გაზიარება"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "შეცდომა გაზიარების დროს"
 
@@ -411,19 +410,19 @@ msgstr "პაროლით დაცული"
 msgid "Error unsetting expiration date"
 msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "შეცდომა ვადის გასვლის მითითების დროს"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "გაგზავნა ...."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "იმეილი გაიგზავნა"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "გაფრთხილება"
 
@@ -537,6 +536,18 @@ 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 "პირადი"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 29de6f20082..71cff17cdab 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "ფაილის სახელი არ შეიძლება იყოს ცარიელი."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "ფაილი არ აიტვირთა. უცნობი შეცდომა"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "ფაილი არ აიტვირთა"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "დროებითი საქაღალდე არ არსებობს"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "შეცდომა დისკზე ჩაწერისას"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "საცავში საკმარისი ადგილი არ არის"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "დაუშვებელი დირექტორია."
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "გაზიარება"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "სრულად წაშლა"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "შეცდომა"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} შეცვლილია {old_name}–ით"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "დაბრუნება"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "შეცვლილია"
 
@@ -305,113 +297,109 @@ msgstr "შეცვლილია"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "ატვირთვა"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "ფაილის დამუშავება"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "მაქსიმუმ ატვირთის ზომა"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "მაქს. შესაძლებელი:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "საჭიროა მულტი ფაილ ან საქაღალდის ჩამოტვირთვა."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP-Download–ის ჩართვა"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 is unlimited"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP ფაილების მაქსიმუმ დასაშვები ზომა"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "შენახვა"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "ახალი"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "ტექსტური ფაილი"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "ახალი ფოლდერი"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "საქაღალდე"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "მისამართიდან"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "წაშლილი ფაილები"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "ატვირთვის გაუქმება"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "აქ არაფერი არ არის. ატვირთე რამე!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "წაშლა"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "ასატვირთი ფაილი ძალიან დიდია"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "ფაილური სისტემის ქეშის განახლება...."
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index f4c239e65c4..5bb8ccc954b 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "გთხოვთ მიუთითოთ Dropbox აპლიკა�
 msgid "Error configuring Google Drive storage"
 msgstr "შეცდომა Google Drive საცავის კონფიგურირების დროს"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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 ზიარების მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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 ზიარის მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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–ის მონტირება შეუძლებელია. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "ექსტერნალ საცავი"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "ფოლდერის სახელი"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "ექსტერნალ საცავი"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "კონფიგურაცია"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "ოფცია"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "მიღებადი"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "საცავის დამატება"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "არაფერია მითითებული"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "ყველა მომხმარებელი"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "ჯგუფები"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "წაშლა"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "მომხმარებლის ექსტერნალ საცავის აქტივირება"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL root სერთიფიკატები"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Root სერთიფიკატის იმპორტირება"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 775fa57d28f..d6c36f3cf5a 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP download–ი გათიშულია"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "ფაილები უნდა გადმოიტვირთოს სათითაოდ."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "უკან ფაილებში"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "არჩეული ფაილები ძალიან დიდია zip ფაილის გენერაციისთვის."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი."
 
@@ -206,9 +206,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 "DB შეცდომა: \"%s\""
@@ -217,9 +217,9 @@ 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 "Offending ბრძანება იყო: \"%s\""
@@ -255,7 +255,7 @@ msgstr "Oracle იუზერნეიმი და/ან პაროლი �
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Offending ბრძანება იყო: \"%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 იუზერნეიმი და/ან პაროლი არ არის სწორი"
 
@@ -267,19 +267,19 @@ msgstr "დააყენეთ ადმინისტრატორის �
 msgid "Set an admin password."
 msgstr "დააყენეთ ადმინისტრატორის პაროლი."
 
-#: private/setup.php:198
+#: 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 "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr "ბოლო წელს"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "წლის წინ"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "უნდა მიუთითოთ არსებული მომხმარებლის სახელი"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "უნდა მიუთითოთ არსებული პაროლი"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index a4b386d25e2..deed78e7873 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -48,15 +48,15 @@ msgstr "იმეილი გაიგზავნა"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "ენკრიპცია"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Unable to load list from App Store"
 msgstr "აპლიკაციების სია ვერ ჩამოიტვირთა 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 "ავთენტიფიკაციის შეცდომა"
 
@@ -127,32 +127,32 @@ 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 ""
 
@@ -204,7 +204,7 @@ msgstr "შეცდომა აპლიკაციის განახლ�
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "განახლება"
 
@@ -212,7 +212,7 @@ msgstr "განახლება"
 msgid "Updated"
 msgstr "განახლებულია"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr "უნდა მიუთითოთ არსებული პარ
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "უსაფრთხოების გაფრთხილება"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "გაფრთხილება დაყენებისას"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "მოდული 'fileinfo'  არ არსებობს"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "ლოკალიზაცია არ მუშაობს"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "ინტერნეტ კავშირი არ მუშაობს"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron–ი"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "გაზიარება"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Share API–ის ჩართვა"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "დაუშვი აპლიკაციების უფლება  Share API –ზე"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "ლინკების დაშვება"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "გადაზიარების დაშვება"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის გაზიარებული"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "უსაფრთხოება"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS–ის ჩართვა"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "სერვერის მისამართი"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "პორტი"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "იუზერ/პაროლი"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "ლოგი"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "ლოგირების დონე"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "უფრო მეტი"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "უფრო ნაკლები"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "ვერსია"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "დაამატე შენი აპლიკაცია"
 msgid "More Apps"
 msgstr "უფრო მეტი აპლიკაციები"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "აირჩიეთ აპლიკაცია"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>"
 
@@ -649,108 +665,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "თქვენი პაროლი შეიცვალა"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "თქვენი პაროლი არ შეიცვალა"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "მიმდინარე პაროლი"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "იმეილი"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "თქვენი იმეილ მისამართი"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "უარყოფა"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "ენა"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "თარგმნის დახმარება"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 848926c0e6f..5dc273c6b7e 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "სპეციალური ატრიბუტები"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "ქვოტას ველი"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "საწყისი ქვოტა"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "ბაიტებში"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "იმეილის ველი"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/km/core.po b/l10n/km/core.po
index dc01eae97b7..75a4a0c4afd 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,59 +135,59 @@ msgstr "ខែវិច្ឆិកា"
 msgid "December"
 msgstr "ខែធ្នូ"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "ការកំណត់"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "កំពុង​រក្សាទុក"
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "វិនាទី​មុន"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n នាទី​មុន"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ម៉ោង​មុន"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "ថ្ងៃនេះ"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ម្សិលមិញ"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ថ្ងៃ​មុន"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "ខែមុន"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n ខែ​មុន"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "ខែ​មុន"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "ឆ្នាំ​មុន"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "ឆ្នាំ​មុន"
 
@@ -234,32 +225,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "លើកលែង"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -292,11 +291,11 @@ msgid "Share"
 msgstr "ចែក​រំលែក"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "កំហុស"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "កំហុស​ពេល​ចែក​រំលែក"
 
@@ -412,19 +411,19 @@ msgstr "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "កំពុង​ផ្ញើ ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "បាន​ផ្ញើ​អ៊ីមែល"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "បម្រាម"
 
@@ -538,6 +537,18 @@ 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 "ផ្ទាល់​ខ្លួន"
diff --git a/l10n/km/files.po b/l10n/km/files.po
index 06bd6601cf7..ac62c9a40c5 100644
--- a/l10n/km/files.po
+++ b/l10n/km/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-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 12:10+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "ចែក​រំលែក"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "កំហុស"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
-msgstr "មិន​ធ្វើ​វិញ"
+#: js/filelist.js:630
+msgid "Could not rename file"
+msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "ឈ្មោះ"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "ទំហំ"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -305,113 +297,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "ផ្ទុក​ឡើង"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "រក្សាទុក"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "ថត​ថ្មី"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "ថត"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "ទាញយក"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "លុប"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/km/files_external.po b/l10n/km/files_external.po
index 343c6971f6e..3b8216e3de5 100644
--- a/l10n/km/files_external.po
+++ b/l10n/km/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "ឈ្មោះ​ថត"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "ក្រុ"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "អ្នកប្រើ"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "លុប"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/km/lib.po b/l10n/km/lib.po
index a9404549af5..3bc0663f9b6 100644
--- a/l10n/km/lib.po
+++ b/l10n/km/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -66,23 +66,23 @@ msgstr "រូបភាព​មិន​ត្រឹម​ត្រូវ"
 msgid "web services under your control"
 msgstr "សេវាកម្ម​វេប​ក្រោម​ការ​ការ​បញ្ជា​របស់​អ្នក"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "បាន​បិទ​ការ​ទាញ​យក ZIP ។"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "ត្រូវ​ការ​ទាញ​យក​ឯកសារ​ម្ដង​មួយៗ។"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "ត្រឡប់​ទៅ​ឯកសារ"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "ឯកសារ​ដែល​បាន​ជ្រើស មាន​ទំហំ​ធំ​ពេក​ក្នុង​ការ​បង្កើត​ជា zip ។"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ 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 ""
 
@@ -207,9 +207,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "កំហុស DB៖ \"%s\""
@@ -218,9 +218,9 @@ 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 ""
@@ -256,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 "ឈ្មោះ​អ្នក​ប្រើ និង/ឬ ពាក្យ​សម្ងាត់ PostgreSQL គឺ​មិន​ត្រូវ​ទេ"
 
@@ -268,19 +268,19 @@ msgstr "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្
 msgid "Set an admin password."
 msgstr "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។"
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -333,3 +333,21 @@ msgstr "ឆ្នាំ​មុន"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "ឆ្នាំ​មុន"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
index 928c286bb73..f551450fbe0 100644
--- a/l10n/km/settings.po
+++ b/l10n/km/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -49,15 +49,15 @@ msgstr "បាន​ផ្ញើ​អ៊ីមែល"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -66,7 +66,7 @@ msgid "Unable to load list from App Store"
 msgstr "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី 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 "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ"
 
@@ -128,32 +128,32 @@ 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 ""
 
@@ -205,7 +205,7 @@ msgstr "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុ
 msgid "Error"
 msgstr "កំហុស"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
 
@@ -213,7 +213,7 @@ msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
 msgid "Updated"
 msgstr "បាន​ធ្វើ​បច្ចុប្បន្នភាព"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -237,7 +237,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -286,7 +286,7 @@ msgstr "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -334,18 +334,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "បម្រាម​សុវត្ថិភាព"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -354,68 +354,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "បម្រាម​ការ​ដំឡើង"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "ខ្វះ​ម៉ូឌុល 'fileinfo'"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។"
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale មិន​ដំណើរការ"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "ការ​តភ្ជាប់​អ៊ីនធឺណិត​មិន​មាន​ដំណើរ​ការ"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -424,162 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "ការ​ចែក​រំលែក"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "បើក API ចែក​រំលែក"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "អនុញ្ញាត​តំណ"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​តំណ"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "សុវត្ថិភាព"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "បង្ខំ HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "កម្រិត Log"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "ច្រើន​ទៀត"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "តិច"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "កំណែ"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +613,23 @@ msgstr "បន្ថែម​កម្មវិធី​របស់​អ្ន
 msgid "More Apps"
 msgstr "កម្មវិធី​ច្រើន​ទៀត"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "ជ្រើស​កម្មវិធី​មួយ"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -650,108 +666,108 @@ msgstr ""
 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
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "ពាក្យសម្ងាត់"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "ពាក្យសម្ងាត់​បច្ចុប្បន្ន"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "ពាក្យ​សម្ងាត់​ថ្មី"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "ប្តូរ​ពាក្យសម្ងាត់"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "អ៊ីមែល"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "អ៊ីម៉ែល​របស់​អ្នក"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "លើកលែង"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "ភាសា"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "ជួយ​បក​ប្រែ"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index 9a3c86b8c51..5a41e124531 100644
--- a/l10n/km/user_ldap.po
+++ b/l10n/km/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -418,41 +418,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -468,15 +479,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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,19 +498,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -513,10 +524,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 815d82a3000..0d2fc8f5d55 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -411,19 +410,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -537,6 +536,18 @@ 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 ""
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index b5edb6c6c41..0476da9576d 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: kn\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -305,113 +297,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
index 4a33e253396..9d3bc476143 100644
--- a/l10n/kn/files_external.po
+++ b/l10n/kn/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 01945d87b2e..f54ae77bc83 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 376741d5530..cfb8736938b 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 43493a88cac..4c39375aee3 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 5c80144d57d..6932d89f8b3 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
-"PO-Revision-Date: 2014-03-16 20:30+0000\n"
-"Last-Translator: Harim Park <fofwisdom@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -24,36 +24,27 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "%s 님에게 메일을 보낼 수 없습니다."
 
-#: 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 "... %d%% 완료됨 ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "이미지나 파일이 없음"
@@ -150,59 +141,59 @@ msgstr "11월"
 msgid "December"
 msgstr "12월"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "저장 중..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "초 전"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n분 전 "
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n시간 전 "
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n일 전 "
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n달 전 "
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "작년"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "년 전"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr "파일 1개 충돌"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "어느 파일을 유지하시겠습니까?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "취소"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "계속"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(모두 선택됨)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count}개 선택됨)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "파일 존재함 템플릿을 불러오는 중 오류 발생"
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "공유"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "오류"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "공유하는 중 오류 발생"
 
@@ -418,19 +417,19 @@ msgstr "암호로 보호됨"
 msgid "Error unsetting expiration date"
 msgstr "만료 날짜 해제 오류"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "만료 날짜 설정 오류"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "전송 중..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "이메일 발송됨"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "경고"
 
@@ -544,6 +543,18 @@ 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 "개인"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 03bac6149ad..5374b3edc40 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -23,48 +23,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "파일 이름이 비어 있을 수 없습니다."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "올바르지 않은 원본"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십시오"
@@ -74,74 +74,74 @@ msgstr "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십�
 msgid "Error while downloading %s to %s"
 msgstr "%s을(를) %s(으)로 다운로드하는 중 오류 발생"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "폴더 생성 중 오류 발생"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "업로드 디렉터리를 설정할 수 없습니다."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "잘못된 토큰"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류입니다"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "파일 업로드에 성공하였습니다."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "파일의 일부분만 업로드됨"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "파일이 업로드되지 않았음"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "임시 폴더가 없음"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "디스크에 쓰지 못했습니다"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "저장소가 용량이 충분하지 않습니다."
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "업로드에 실패했습니다. 업로드할 파일을 찾을 수 없습니다"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "업로드에 실패했습니다. 파일 정보를 가져올 수 없습니다."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "올바르지 않은 디렉터리입니다."
 
@@ -162,90 +162,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "서버에서 결과를 가져올 수 없습니다."
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL이 비어있을 수 없음"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "'공유됨'은 홈 폴더의 예약된 파일 이름임"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "파일을 만들 수 없음"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "폴더를 만들 수 없음"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "URL을 가져올 수 없음"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "공유"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "영구히 삭제"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "파일 이동 오류"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "오류"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "대기 중"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "파일 삭제 오류."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "폴더 %n개"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "파일 %n개"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} 그리고 {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "파일 %n개 업로드 중"
@@ -281,29 +281,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오."
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "수정됨"
 
@@ -311,113 +303,109 @@ msgstr "수정됨"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "폴더 이름이 잘못되었습니다. '공유됨'은 예약된 폴더 이름입니다."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s의 이름을 변경할 수 없습니다"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "업로드"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "파일 처리"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "최대 업로드 크기"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "최대 가능:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "다중 파일 및 폴더 다운로드에 필요합니다."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP 다운로드 허용"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0은 무제한입니다"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP 파일 최대 크기"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "저장"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "새로 만들기"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "새 텍스트 파일"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "텍스트 파일"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "새 폴더"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "폴더"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "링크에서"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "삭제된 파일"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "여기에 파일을 업로드하거나 만들 권한이 없습니다"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "업로드한 파일이 너무 큼"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "현재 검색"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "파일 시스템 캐시 업그레이드 중..."
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index af6f96583d0..f49c86091e1 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "올바른 Dropbox 앱 키와 암호를 입력하십시오."
 msgid "Error configuring Google Drive storage"
 msgstr "Google 드라이브 저장소 설정 오류"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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 공유 자원에 연결할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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, Google 드라이브 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "외부 저장소"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "폴더 이름"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "외부 저장소"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "설정"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "옵션"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "적용 가능"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "저장소 추가"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "설정되지 않음"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "모든 사용자"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "사용자"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "사용자 외부 저장소 사용"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL 루트 인증서"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "루트 인증서 가져오기"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index c1cc5c23314..02e1760e6aa 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -70,23 +70,23 @@ msgstr "잘못된 그림"
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP 다운로드가 비활성화 되었습니다."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "파일을 개별적으로 다운로드해야 합니다."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "파일로 돌아가기"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -197,8 +197,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "기존 계정이나 administrator(관리자)를 입력해야 합니다."
 
@@ -211,9 +211,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 "DB 오류: \"%s\""
@@ -222,9 +222,9 @@ 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\""
@@ -260,7 +260,7 @@ msgstr "Oracle 사용자 이름이나 암호가 잘못되었습니다."
 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의 사용자 이름 또는 암호가 잘못되었습니다"
 
@@ -272,19 +272,19 @@ msgstr "관리자의 사용자 이름을 설정합니다."
 msgid "Set an admin password."
 msgstr "관리자의 암호를 설정합니다."
 
-#: private/setup.php:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s 님이 %s을(를) 공유하였습니다"
@@ -337,3 +337,21 @@ msgstr "작년"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "년 전"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "올바른 사용자 이름을 입력해야 함"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "올바른 암호를 입력해야 함"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 09606d0f539..7ede0d46667 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
-"PO-Revision-Date: 2014-03-16 20:30+0000\n"
-"Last-Translator: Harim Park <fofwisdom@gmail.com>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -52,15 +52,15 @@ msgstr "이메일 발송됨"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "암호화"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -69,7 +69,7 @@ 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 "인증 오류"
 
@@ -131,32 +131,32 @@ msgstr "그룹 %s에서 사용자를 삭제할 수 없음"
 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 "암호를 변경할 수 없음"
 
@@ -208,7 +208,7 @@ msgstr "앱을 업데이트하는 중 오류 발생"
 msgid "Error"
 msgstr "오류"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "업데이트"
 
@@ -216,31 +216,31 @@ msgstr "업데이트"
 msgid "Updated"
 msgstr "업데이트됨"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "프로필 사진 선택"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "매우 약한 암호"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "약한 암호"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "그저 그런 암호"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "좋은 암호"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "강력한 암호"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오."
 
@@ -289,7 +289,7 @@ msgstr "올바른 암호를 입력해야 함"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "경고: 사용자 \"{user}\"의 홈 디렉터리가 이미 존재합니다"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "한국어"
 
@@ -432,157 +432,173 @@ 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "공유"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "공유 API 사용하기"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "앱에서 공유 API를 사용할 수 있도록 허용"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "링크 허용"
 
-#: templates/admin.php:203
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
 
-#: templates/admin.php:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "공개 업로드 허용"
 
-#: templates/admin.php:212
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "다른 사용자들이 공개된 공유 폴더에 파일 업로드 허용"
 
-#: templates/admin.php:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "재공유 허용"
 
-#: templates/admin.php:221
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
 
-#: templates/admin.php:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "누구나와 공유할 수 있도록 허용"
 
-#: templates/admin.php:231
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "사용자가 속해 있는 그룹의 사용자에게만 공유할 수 있도록 허용"
 
-#: templates/admin.php:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "메일 알림 허용"
 
-#: templates/admin.php:239
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "사용자에게 공유 파일에 대한 메일 알림을 허용합니다"
 
-#: templates/admin.php:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "보안"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS 강제 사용"
 
-#: templates/admin.php:261
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다."
 
-#: templates/admin.php:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "전자우편 서버"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "보낸 이 주소"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "인증 필요함"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "서버 주소"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "포트"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "자격 정보"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP 사용자명"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP 암호"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "시험용 전자우편 설정"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "전자우편 보내기"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "로그 단계"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "더 중요함"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "덜 중요함"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -600,23 +616,23 @@ msgstr "내 앱 추가"
 msgid "More Apps"
 msgstr "더 많은 앱"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "앱 선택"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "문서"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com에 있는 앱 페이지를 참고하십시오"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-라이선스됨: <span class=\"author\"></span>"
 
@@ -653,108 +669,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "암호"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "암호가 변경되었습니다"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "암호를 변경할 수 없음"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "현재 암호"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "새 암호"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "암호 변경"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "전체 이름"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "이메일"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "이메일 주소"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "프로필 사진"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "새로 업로드"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "파일에서 선택"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "그림 삭제"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "png나 jpg를 사용하십시오. 정사각형 형태가 가장 좋지만 잘라낼 수 있습니다."
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "원본 계정의 아바타를 사용합니다."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "취소"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "프로필 이미지로 사용"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "언어"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "번역 돕기"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다."
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "로그인 암호"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "모든 파일 복호화"
 
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index c8074d818e6..b8de7e931fc 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -420,41 +420,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "특수 속성"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "할당량 필드"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "기본 할당량"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "바이트 단위"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "이메일 필드"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "사용자 홈 폴더 이름 규칙"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "내부 사용자 이름"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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에 해당하는 문자열로 변경되거나 없는 글자로 취급됩니다. 충돌하는 경우 숫자가 붙거나 증가합니다. 내부 사용자 이름은 내부적으로 사용자를 식별하는 데 사용되며, 사용자 홈 폴더의 기본 이름입니다. 또한 *DAV와 같은 외부 URL의 일부로 사용됩니다. 이 설정을 사용하면 기본 설정을 재정의할 수 있습니다. ownCloud 5 이전의 행동을 사용하려면 아래 필드에 사용자의 표시 이름 속성을 입력하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자에게만 적용됩니다."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "내부 사용자 이름 속성:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "UUID 확인 재정의"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "기본적으로 UUID 속성은 자동적으로 감지됩니다. UUID 속성은 LDAP 사용자와 그룹을 정확히 식별하는 데 사용됩니다. 지정하지 않은 경우 내부 사용자 이름은 UUID를 기반으로 생성됩니다. 이 설정을 다시 정의하고 임의의 속성을 지정할 수 있습니다. 사용자와 그룹 모두에게 속성을 적용할 수 있고 중복된 값이 없는지 확인하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자와 그룹에만 적용됩니다."
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "사용자 UUID 속성:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "그룹 UUID 속성:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "사용자 이름-LDAP 사용자 매핑"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 "사용자 이름은 (메타) 데이터를 저장하고 할당하는 데 사용됩니다. 사용자를 정확하게 식별하기 위하여 각각 LDAP 사용자는 내부 사용자 이름을 갖습니다. 이는 사용자 이름과 LDAP 사용자 간의 매핑이 필요합니다. 생성된 사용자 이름은 LDAP 사용자의 UUID로 매핑됩니다. 추가적으로 LDAP 통신을 줄이기 위해서 DN이 캐시에 저장되지만 식별에 사용되지는 않습니다. DN이 변경되면 변경 사항이 기록됩니다. 내부 사용자 이름은 계속 사용됩니다. 매핑을 비우면 흔적이 남아 있게 됩니다. 매핑을 비우는 작업은 모든 LDAP 설정에 영향을 줍니다! 테스트 및 실험 단계에만 사용하고, 사용 중인 서버에서는 시도하지 마십시오."
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "사용자 이름-LDAP 사용자 매핑 비우기"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "그룹 이름-LDAP 그룹 매핑 비우기"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 07561eda0ef..3f62db2a42d 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "لابردن"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr "هاوبەشی کردن"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "ئاگاداری"
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 3a8e0eb38f7..5f3a1447686 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "هاوبەشی کردن"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "هه‌ڵه"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "بارکردن"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "پاشکه‌وتکردن"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "بوخچه"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index 763ce3e955c..a7bfce656ab 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "ناوی بوخچه"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 898c8550158..eab0771ad84 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 720e547b850..2ce49de9cc1 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "نهێنیکردن"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "نوێکردنه‌وه"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "ناونیشانی ڕاژه"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 1305adc5d8f..e006b5932ac 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 155b77ea475..e07f5422ac6 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 "Maintenance Modus ass un"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Maintenance Modus ass aus"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -145,63 +136,63 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Speicheren..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n Minutt hir"
 msgstr[1] "%n Minutten hir"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "haut"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "gëschter"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "leschte Mount"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "Méint hir"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "Lescht Joer"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "Joren hir"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Weieng Fichieren wëlls de gär behalen?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Weider"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(all ausgewielt)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} ausgewielt)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "Deelen"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Feeler"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Feeler beim Deelen"
 
@@ -418,19 +417,19 @@ msgstr "Passwuertgeschützt"
 msgid "Error unsetting expiration date"
 msgstr "Feeler beim Läsche vum Verfallsdatum"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Feeler beim Setze vum Verfallsdatum"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Gëtt geschéckt..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email geschéckt"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warnung"
 
@@ -544,6 +543,18 @@ msgstr "Neit Passwuert"
 msgid "Reset password"
 msgstr "Passwuert zréck setzen"
 
+#: 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 "Perséinlech"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 40414cb0931..98509d0c5cf 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Keen Feeler, Datei ass komplett ropgelueden ginn"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Et ass kee Fichier ropgeluede ginn"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Et feelt en temporären Dossier"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Konnt net op den Disk schreiwen"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Deelen"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Ëm-benennen"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Fehler"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
-msgstr "réckgängeg man"
+#: js/filelist.js:630
+msgid "Could not rename file"
+msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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 "Fehler"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Geännert"
 
@@ -308,113 +300,109 @@ msgstr "Geännert"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Eroplueden"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Fichier handling"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximum Upload Gréisst "
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. méiglech:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Gett gebraucht fir multi-Fichier an Dossier Downloads."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP-download erlaben"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 ass onlimitéiert"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maximal Gréisst fir ZIP Fichieren"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Späicheren"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nei"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Text Fichier"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Momentane Scan"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index da271f5570a..36504b273fd 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Dossiers Numm:"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Benotzer"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 1bec6207b74..403353e5beb 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -66,23 +66,23 @@ msgstr "Ongülteg d'Bild"
 msgid "web services under your control"
 msgstr "Web-Servicer ënnert denger Kontroll"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ 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 ""
 
@@ -207,9 +207,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
@@ -218,9 +218,9 @@ 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 ""
@@ -256,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 ""
 
@@ -268,19 +268,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "Den/D' %s huet »%s« mat dir gedeelt"
@@ -337,3 +337,21 @@ msgstr "Läscht Joer"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "Joren hier"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index bd42abab9f4..dc9db7025c8 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Email geschéckt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -212,31 +212,31 @@ msgstr "Update"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sécherheets Warnung"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Share API aschalten"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Erlab Apps d'Share API ze benotzen"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Links erlaben"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Resharing erlaben"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Useren erlaben mat egal wiem ze sharen"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Server Adress"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Méi"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Manner"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index fe03047f218..7ffaec0adf3 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 2117fdda97a..bde5eb1e70e 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -22,36 +22,27 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nepavyko nusiųsti el. pašto šiems naudotojams: %s "
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Įjungta priežiūros veiksena"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Išjungta priežiūros veiksena"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -148,67 +139,67 @@ msgstr "Lapkritis"
 msgid "December"
 msgstr "Gruodis"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Saugoma..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:996
+#: js/js.js:1125
 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:997
+#: js/js.js:1126
 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:998
+#: js/js.js:1127
 msgid "today"
 msgstr "šiandien"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:1000
+#: js/js.js:1129
 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:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:1002
+#: js/js.js:1131
 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:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -248,32 +239,40 @@ msgid "One file conflict"
 msgstr "Vienas failo konfliktas"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Kuriuos failus norite laikyti?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Tęsti"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(visi pažymėti)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} pažymėtų)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Klaida įkeliant esančių failų ruošinį"
 
@@ -306,11 +305,11 @@ msgid "Share"
 msgstr "Dalintis"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Klaida"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
@@ -426,19 +425,19 @@ msgstr "Apsaugota slaptažodžiu"
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laiką"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laiką"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Siunčiama..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Laiškas išsiųstas"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Įspėjimas"
 
@@ -552,6 +551,18 @@ msgstr "Naujas slaptažodis"
 msgid "Reset password"
 msgstr "Atkurti slaptažodį"
 
+#: 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 "Asmeniniai"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 5d51db92195..8d013e7a1ab 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -20,48 +20,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/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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Netinkamas šaltinis"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Serveriui neleidžiama atverti URL, prašome patikrinti serverio konfigūraciją"
@@ -71,74 +71,74 @@ msgstr "Serveriui neleidžiama atverti URL, prašome patikrinti serverio konfig�
 msgid "Error while downloading %s to %s"
 msgstr "Klaida siunčiant %s į %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Klaida kuriant aplanką"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Nepavyksta nustatyti įkėlimų katalogo."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Netinkamas ženklas"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Failai nebuvo įkelti dėl nežinomos priežasties"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Failas įkeltas sėkmingai, be klaidų"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nebuvo įkeltas joks failas"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Nėra laikinojo katalogo"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Nepavyko įrašyti į diską"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nepakanka vietos serveryje"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Įkėlimas nepavyko. Nepavyko rasti įkelto failo"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Neteisingas aplankas"
 
@@ -159,94 +159,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Nepavyko gauti rezultato iš serverio."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL negali būti tuščias."
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Pradiniame aplanke failo pavadinimas „Shared“ yra rezervuotas"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Neįmanoma sukurti failo"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Neįmanoma sukurti aplanko"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Klauda gaunant URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Ištrinti negrįžtamai"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Klaida perkeliant failą"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Klaida"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Neįmanoma pervadinti failo"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "pakeiskite {new_name} į {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "anuliuoti"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Klaida trinant failą."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n aplankas"
 msgstr[1] "%n aplankai"
 msgstr[2] "%n aplankų"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n failas"
 msgstr[1] "%n failai"
 msgstr[2] "%n failų"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} ir {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Įkeliamas %n failas"
@@ -284,29 +284,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Klaida perkeliant failą"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Klaida"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Pakeista"
 
@@ -314,113 +306,109 @@ msgstr "Pakeista"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Netinkamas aplanko pavadinimas. „Shared“ pavadinimas yra rezervuotas."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s negali būti pervadintas"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Įkelti"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Failų tvarkymas"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimalus įkeliamo failo dydis"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maks. galima:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Reikalinga daugybinui failų ir aplankalų atsisiuntimui."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Įjungti atsisiuntimą ZIP archyvu"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 yra neribotas"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimalus ZIP archyvo failo dydis"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Naujas"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Naujas tekstinis failas"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Teksto failas"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Naujas aplankas"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Katalogas"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Iš nuorodos"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Ištrinti failai"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/lt_LT/files_external.po
index 79161e530c4..32c73989f77 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\"."
 msgid "Error configuring Google Drive storage"
 msgstr "Klaida nustatinėjant Google Drive talpyklą"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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\""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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. "
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Įspėjimas:</b> \"Curl\" palaikymas PHP terpėje nėra įjungtas arba įdiegtas. ownCloud/WebDAV ar GoogleDrive įjungimas nebus įmanomas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas arba įjungtas \"Curl\" palaikymas."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Išorinės saugyklos"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Katalogo pavadinimas"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Išorinė saugykla"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfigūracija"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Nustatymai"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Pritaikyti"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Pridėti saugyklą"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nieko nepasirinkta"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Visi vartotojai"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupės"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Vartotojai"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Įjungti vartotojų išorines saugyklas"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL sertifikatas"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Įkelti pagrindinį sertifikatą"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index a3d06e1c28f..58ff50b54f6 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -69,23 +69,23 @@ msgstr "Netinkamas paveikslėlis"
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Atgal į Failus"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -196,8 +196,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %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 "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi."
 
@@ -210,9 +210,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 "DB klaida: \"%s\""
@@ -221,9 +221,9 @@ msgstr "DB klaida: \"%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 "Vykdyta komanda buvo: \"%s\""
@@ -259,7 +259,7 @@ msgstr "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Vykdyta komanda buvo: \"%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 "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis"
 
@@ -271,19 +271,19 @@ msgstr "Nustatyti administratoriaus naudotojo vardą."
 msgid "Set an admin password."
 msgstr "Nustatyti administratoriaus slaptažodį."
 
-#: private/setup.php:198
+#: 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 "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s pasidalino »%s« su tavimi"
@@ -344,3 +344,21 @@ msgstr "praeitais metais"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "prieš metus"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Vartotojo vardas turi būti tinkamas"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Slaptažodis turi būti tinkamas"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 73acc5aabf2..4b4e306f816 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -52,15 +52,15 @@ msgstr "Laiškas išsiųstas"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Šifravimas"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -69,7 +69,7 @@ msgid "Unable to load list from App Store"
 msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
 
 #: 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 "Autentikacijos klaida"
 
@@ -131,32 +131,32 @@ msgstr "Nepavyko ištrinti vartotojo iš grupės %s"
 msgid "Couldn't update app."
 msgstr "Nepavyko atnaujinti programos."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Neteisingas slaptažodis"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Nepateiktas naudotojas"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl."
 
-#: 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 "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Nepavyksta pakeisti slaptažodžio"
 
@@ -208,7 +208,7 @@ msgstr "Įvyko klaida atnaujinant programą"
 msgid "Error"
 msgstr "Klaida"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Atnaujinti"
 
@@ -216,7 +216,7 @@ msgstr "Atnaujinti"
 msgid "Updated"
 msgstr "Atnaujinta"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Pažymėkite profilio paveikslėlį"
 
@@ -240,7 +240,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti."
 
@@ -289,7 +289,7 @@ msgstr "Slaptažodis turi būti tinkamas"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Kalba"
 
@@ -337,18 +337,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Saugumo pranešimas"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -357,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Nustatyti perspėjimą"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Trūksta 'fileinfo' modulio"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalė neveikia"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Nėra interneto ryšio"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -427,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Dalijimasis"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Įjungti Share API"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Leidžia programoms naudoti Share API"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Lesti nuorodas"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Leisti viešus įkėlimus"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Leisti dalintis"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Leisti naudotojams dalintis su bet kuo"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Leisti el. pašto perspėjimą"
 
-#: templates/admin.php:235
+#: 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:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Saugumas"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Reikalauti HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Serverio adresas"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Prievadas"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Žurnalo išsamumas"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mažiau"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -600,23 +616,23 @@ msgstr "Pridėti programėlę"
 msgid "More Apps"
 msgstr "Daugiau aplikacijų"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Pasirinkite programą"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Žiūrėti programos puslapį svetainėje apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
 
@@ -653,108 +669,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Jūsų slaptažodis buvo pakeistas"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Neįmanoma pakeisti slaptažodžio"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "El. Paštas"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Jūsų el. pašto adresas"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilio paveikslėlis"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Įkelti naują"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Pasirinkti naują iš failų"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Pašalinti paveikslėlį"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Pasirinkite profilio paveiksliuką"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Padėkite išversti"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Prisijungimo slaptažodis"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Iššifruoti visus failus"
 
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index a67be7dfd94..1e9fab49ec4 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -423,41 +423,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Specialūs atributai"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kvotos laukas"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Numatyta kvota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "baitais"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "El. pašto laukas"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Naudotojo namų aplanko pavadinimo taisyklė"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Vidinis naudotojo vardas"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -473,15 +484,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Vidinis naudotojo vardo atributas:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Perrašyti UUID aptikimą"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Naudotojo vardo - LDAP naudotojo sąsaja"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -518,10 +529,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Išvalyti naudotojo vardo - LDAP naudotojo sąsają"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 2cfe24a115d..89c1ba7879c 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,67 +135,67 @@ msgstr "Novembris"
 msgid "December"
 msgstr "Decembris"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Saglabā..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:996
+#: js/js.js:1125
 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:997
+#: js/js.js:1126
 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:998
+#: js/js.js:1127
 msgid "today"
 msgstr "šodien"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:1000
+#: js/js.js:1129
 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:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: js/js.js:1002
+#: js/js.js:1131
 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:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "mēnešus atpakaļ"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
@@ -244,32 +235,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Jaunās datnes"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -302,11 +301,11 @@ msgid "Share"
 msgstr "Dalīties"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Kļūda, daloties"
 
@@ -422,19 +421,19 @@ msgstr "Aizsargāts ar paroli"
 msgid "Error unsetting expiration date"
 msgstr "Kļūda, noņemot termiņa datumu"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Kļūda, iestatot termiņa datumu"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sūta..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Vēstule nosūtīta"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Brīdinājums"
 
@@ -548,6 +547,18 @@ msgstr "Jauna parole"
 msgid "Reset password"
 msgstr "Mainīt paroli"
 
+#: 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 "Personīgi"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 826191169fa..8c47b755a3c 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -18,48 +18,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -69,74 +69,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Nevar uzstādīt augšupielādes mapi."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Nepareiza pilnvara"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Netika augšupielādēta neviena datne. Nezināma kļūda"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 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:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 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:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Neviena datne netika augšupielādēta"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Trūkst pagaidu mapes"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Neizdevās saglabāt diskā"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nav pietiekami daudz vietas"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Nederīga direktorija."
 
@@ -157,94 +157,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Dzēst pavisam"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Kļūda"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "aizvietoja {new_name} ar {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "atsaukt"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapes"
 msgstr[1] "%n mape"
 msgstr[2] "%n mapes"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n faili"
 msgstr[1] "%n fails"
 msgstr[2] "%n faili"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n"
@@ -282,29 +282,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr ""
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Kļūda"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Mainīts"
 
@@ -312,113 +304,109 @@ msgstr "Mainīts"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nevar tikt pārsaukts"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Augšupielādēt"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Datņu pārvaldība"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimālais datņu augšupielādes apjoms"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maksimālais iespējamais:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Vajadzīgs vairāku datņu un mapju lejupielādēšanai."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Aktivēt ZIP lejupielādi"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 ir neierobežots"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimālais ievades izmērs ZIP datnēm"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Saglabāt"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Jauna"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Teksta datne"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Jauna mape"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Mape"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "No saites"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Dzēstās datnes"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Atcelt augšupielādi"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augšupielādētu"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/lv/files_external.po
index 893a11ac476..46000f211fe 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu."
 msgid "Error configuring Google Drive storage"
 msgstr "Kļūda, konfigurējot Google Drive krātuvi"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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ē."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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ē."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Brīdinājums:</b> PHP Curl atbalsts nav instalēts.  OwnCloud / WebDAV vai GoogleDrive montēšana nav iespējama. Lūdziet sistēmas administratoram lai tas tiek uzstādīts."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Ārējā krātuve"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Mapes nosaukums"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Ārējā krātuve"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opcijas"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Piemērojams"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Pievienot krātuvi"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Neviens nav iestatīts"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Visi lietotāji"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupas"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Lietotāji"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Aktivēt lietotāja ārējo krātuvi"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL saknes sertifikāti"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importēt saknes sertifikātus"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 6e2a1e8b9cb..5a8a9d5813b 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -66,23 +66,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "tīmekļa servisi tavā varā"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP lejupielādēšana ir izslēgta."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Datnes var lejupielādēt tikai katru atsevišķi."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Atpakaļ pie datnēm"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nav derīga MySQL parole un/vai lietotājvārds — %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 "Jums jāievada vai nu esošs vai administratora konts."
 
@@ -207,9 +207,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB kļūda — “%s”"
@@ -218,9 +218,9 @@ msgstr "DB kļūda — “%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 "Vainīgā komanda bija “%s”"
@@ -256,7 +256,7 @@ msgstr "Nav derīga Oracle parole un/vai lietotājvārds"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Vainīgā komanda bija \"%s\", vārds: %s, parole: %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 "Nav derīga PostgreSQL parole un/vai lietotājvārds"
 
@@ -268,19 +268,19 @@ msgstr "Iestatiet administratora lietotājvārdu."
 msgid "Set an admin password."
 msgstr "Iestatiet administratora paroli."
 
-#: private/setup.php:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s kopīgots »%s« ar jums"
@@ -341,3 +341,21 @@ msgstr "gājušajā gadā"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "gadus atpakaļ"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Jānorāda derīgs lietotājvārds"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Jānorāda derīga parole"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Šāds lietotājvārds jau tiek izmantots"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 56e41f60c3e..13c92ee1a70 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -48,15 +48,15 @@ msgstr "Vēstule nosūtīta"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Unable to load list from App Store"
 msgstr "Nevar lejupielādēt sarakstu no lietotņu veikala"
 
 #: 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 "Autentifikācijas kļūda"
 
@@ -127,32 +127,32 @@ msgstr "Nevar izņemt lietotāju no grupas %s"
 msgid "Couldn't update app."
 msgstr "Nevarēja atjaunināt lietotni."
 
-#: 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 ""
 
@@ -204,7 +204,7 @@ msgstr "Kļūda, atjauninot lietotni"
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Atjaunināt"
 
@@ -212,7 +212,7 @@ msgstr "Atjaunināt"
 msgid "Updated"
 msgstr "Atjaunināta"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku."
 
@@ -285,7 +285,7 @@ msgstr "Jānorāda derīga parole"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Brīdinājums par drošību"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Iestatīšanas brīdinājums"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "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:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Trūkst modulis “fileinfo”"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokāle nestrādā"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Interneta savienojums nedarbojas"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Dalīšanās"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktivēt koplietošanas API"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Ļauj lietotnēm izmantot koplietošanas API"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Atļaut saites"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Atļaut publisko augšupielādi"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Atļaut atkārtotu koplietošanu"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Ļaut lietotājiem dalīties ar visiem"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Drošība"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Uzspiest HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Servera adrese"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Ports"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Akreditācijas dati"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Žurnāls"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Žurnāla līmenis"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Vairāk"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mazāk"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "Pievieno savu lietotni"
 msgid "More Apps"
 msgstr "Vairāk lietotņu"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Izvēlies lietotni"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Apskati lietotņu lapu — apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>"
 
@@ -649,108 +665,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Parole"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Jūru parole tika nomainīta"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Nevar nomainīt jūsu paroli"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Pašreizējā parole"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Jauna parole"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Jūsu e-pasta adrese"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Palīdzi tulkot"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Pieslēgšanās parole"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Atšifrēt visus failus"
 
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index db3bc0393e7..6861a984e01 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Īpašie atribūti"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kvotu lauks"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Kvotas noklusējums"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "baitos"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-pasta lauks"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Lietotāja mājas mapes nosaukšanas kārtula"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index fd2b2f5da12..b513e1ed08b 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 "Не е доставена фотографија или датотека"
@@ -144,63 +135,63 @@ msgstr "Ноември"
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Подесувања"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Снимам..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "денеска"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "минатиот месец"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "пред месеци"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "пред години"
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr "Конфликт со една датотека"
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Откажи"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Продолжи"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(сите одбрани)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} одбраните)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Грешка при вчитување на датотеката, шаблонот постои "
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr "Сподели"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Грешка при споделување"
 
@@ -417,19 +416,19 @@ msgstr "Заштитено со лозинка"
 msgid "Error unsetting expiration date"
 msgstr "Грешка при тргање на рокот на траење"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Грешка при поставување на рок на траење"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Праќање..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Е-порака пратена"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Предупредување"
 
@@ -543,6 +542,18 @@ 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 "Лично"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 1849f959876..72dd6a1caf7 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -18,48 +18,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Името на датотеката не може да биде празно."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Не е валиден извор"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -69,74 +69,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr "Грешка додека преземам %s to %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Грешка при креирање на папка"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Не може да се постави папката за префрлање на податоци."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Грешен токен"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниту еден фајл не се вчита. Непозната грешка"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Датотеката беше успешно подигната."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека."
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Недостасува привремена папка"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Неуспеав да запишам на диск"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Нема доволно слободен сториџ"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Префрлањето е неуспешно. Не можам да го најдам префрлената датотека."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Погрешна папка."
 
@@ -157,92 +157,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Не можам да добијам резултат од серверот."
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL-то не може да биде празно"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Во домашната папка, 'Shared' е резервирано има на датотека/папка"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Не множам да креирам датотека"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Не можам да креирам папка"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Сподели"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Трајно избришани"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Грешка при префрлање на датотека"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Грешка"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Не можам да ја преименувам датотеката"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "заменета {new_name} со {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "врати"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} и {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -279,29 +279,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Променето"
 
@@ -309,113 +301,109 @@ msgstr "Променето"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не може да биде преименуван"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Подигни"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Ракување со датотеки"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Максимална големина за подигање"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "макс. можно:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Потребно за симнување повеќе-датотеки и папки."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Овозможи ZIP симнување "
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 е неограничено"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Максимална големина за внес на ZIP датотеки"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Сними"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ново"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Текстуална датотека"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Од врска"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Избришани датотеки"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Тука нема ништо. Снимете нешто!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Фајлот кој се вчитува е преголем"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Се скенираат датотеки, ве молам почекајте."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Моментално скенирам"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Го надградувам кешот на фјал системот..."
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 42a953da79a..c8506cdd949 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "Ве молам доставите валиден Dropbox клуч и т
 msgid "Error configuring Google Drive storage"
 msgstr "Грешка при конфигурација на Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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 дискови. Замолете го Вашиот систем администратор да го инсталира."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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 дискови. Замолете го Вашиот систем администратор да го инсталира."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Надворешно складиште"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Име на папка"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Конфигурација"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Опции"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Применливо"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ништо поставено"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Сите корисници"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Корисници"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Овозможи надворешни за корисници"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL root сертификати"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Увези"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index fca0fe3c0d6..c611a9b9d0d 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr "Невалидна фотографија"
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Преземање во ZIP е исклучено"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеките треба да се симнат една по една."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Назад кон датотеки"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните датотеки се преголеми за да се генерира zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "минатата година"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "пред години"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Мора да се обезбеди валидно корисничко име "
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Мора да се обезбеди валидна лозинка"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 8d8134d08f2..e6096b1af4f 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -48,15 +48,15 @@ msgstr "Е-порака пратена"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Енкрипција"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Unable to load list from App Store"
 msgstr "Неможам да вчитам листа од 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 "Грешка во автентикација"
 
@@ -127,32 +127,32 @@ msgstr "Неможе да избришам корисник од група %s"
 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 "Вашата лозинка неможе да се смени"
 
@@ -204,7 +204,7 @@ msgstr "Грешка додека ја надградувам апликациј
 msgid "Error"
 msgstr "Грешка"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Ажурирај"
 
@@ -212,7 +212,7 @@ msgstr "Ажурирај"
 msgid "Updated"
 msgstr "Надграден"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Одбери фотографија за профилот"
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr "Мора да се обезбеди валидна лозинка"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Безбедносно предупредување"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Предупредување при подесување"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Локалето не функционира"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Споделување"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Овозможи го API-то за споделување"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Дозволете апликациите да го користат API-то за споделување"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Дозволи врски"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Дозволи јавен аплоуд"
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Овозможи повторно споделување"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Овозможи корисниците да споделуваат со секого"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Овозможи корисниците да споделуваат со корисници од своите групи"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Овозможи известување по електронска пошта"
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Овозможи корисник да испраќа известување по електронска пошта за споделени датотеки"
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Безбедност"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Наметни HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Адреса на сервер"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Порта"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Ниво на логирање"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Помалку"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "Додадете ја Вашата апликација"
 msgid "More Apps"
 msgstr "Повеќе аппликации"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Избери аппликација"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Види ја страницата со апликации на apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>"
 
@@ -649,108 +665,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Вашата лозинка беше променета."
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Вашата лозинка неможе да се смени"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Моментална лозинка"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Смени лозинка"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Вашата адреса за е-пошта"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Фотографија за профил"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Префрли нова"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Одбери нова од датотеките"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Отстрани ја фотографијата"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Мора де биде png или jpg. Идеално квадрат, но ќе бидете во можност да ја исечете."
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Откажи"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Одбери фотографија за профилот"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Јазик"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Помогни во преводот"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Лозинка за најавување"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Дешифрирај ги сите датотеки"
 
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 2b41dae61bc..5550ed99dd9 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -420,41 +420,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
index be4344073ef..23e35f07f39 100644
--- a/l10n/ml/core.po
+++ b/l10n/ml/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/ml/files.po b/l10n/ml/files.po
index 7a752c76749..6d8c4b14482 100644
--- a/l10n/ml/files.po
+++ b/l10n/ml/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ml\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ml/files_external.po b/l10n/ml/files_external.po
index e134fd32240..30d269647a4 100644
--- a/l10n/ml/files_external.po
+++ b/l10n/ml/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ml/lib.po b/l10n/ml/lib.po
index 47b765276d0..7d8386a4852 100644
--- a/l10n/ml/lib.po
+++ b/l10n/ml/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po
index a202b820293..49290f8d798 100644
--- a/l10n/ml/settings.po
+++ b/l10n/ml/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ml/user_ldap.po b/l10n/ml/user_ldap.po
index bb825706df6..74e585ae93b 100644
--- a/l10n/ml/user_ldap.po
+++ b/l10n/ml/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index dd910ad6e79..fc5ab544f59 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 48b9d85a033..73eaed182fe 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ml_IN\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ml_IN/files_external.po b/l10n/ml_IN/files_external.po
index 289d650413e..e8334604a6d 100644
--- a/l10n/ml_IN/files_external.po
+++ b/l10n/ml_IN/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index 21021fc7200..ad9148fab33 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index 15fe7f10de2..5a9922292b9 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index 7d109240d01..39c0ec79a26 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
index 3f5f28b461b..f6d739d99cc 100644
--- a/l10n/mn/core.po
+++ b/l10n/mn/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/mn/files.po b/l10n/mn/files.po
index fb8cf2278ad..a1d5b8b6598 100644
--- a/l10n/mn/files.po
+++ b/l10n/mn/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: mn\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/mn/files_external.po b/l10n/mn/files_external.po
index 8c157a63e24..7547f3512d7 100644
--- a/l10n/mn/files_external.po
+++ b/l10n/mn/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/mn/lib.po b/l10n/mn/lib.po
index 46cbf163ac3..24f3d3b50df 100644
--- a/l10n/mn/lib.po
+++ b/l10n/mn/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po
index 0a9285fe746..f2b9550b985 100644
--- a/l10n/mn/settings.po
+++ b/l10n/mn/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/mn/user_ldap.po b/l10n/mn/user_ldap.po
index b5d1295fd92..51f10319473 100644
--- a/l10n/mn/user_ldap.po
+++ b/l10n/mn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 3efc2ebde6b..2bd3a56010f 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr "November"
 msgid "December"
 msgstr "Disember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Simpan..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Batal"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr "Kongsi"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Ralat"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -411,19 +410,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Amaran"
 
@@ -537,6 +536,18 @@ msgstr "Kata laluan baru"
 msgid "Reset password"
 msgstr "Penetapan semula kata laluan"
 
+#: 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 "Peribadi"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 35c736aaa11..8338e168bb9 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Tiada ralat berlaku, fail berjaya dimuatnaik"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail yang dimuatnaik tidak lengkap"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Tiada fail dimuatnaik"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Direktori sementara hilang"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Gagal untuk disimpan"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Namakan"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Ralat"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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 "Ralat"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Dimodifikasi"
 
@@ -305,113 +297,109 @@ msgstr "Dimodifikasi"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Muat naik"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Pengendalian fail"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Saiz maksimum muat naik"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maksimum:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Diperlukan untuk muatturun fail pelbagai "
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Aktifkan muatturun ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 adalah tanpa had"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Saiz maksimum input untuk fail ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Baru"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Fail teks"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Muatnaik terlalu besar"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Imbasan semasa"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 87cb8d05041..0495b5d172e 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Pengguna"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 3987ff503ef..0d63f98d966 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 7b0a4f27fcc..e76e534f068 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "Kemaskini"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Alamat pelayan"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Tahap Log"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Lanjutan"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 703f27af485..f99f0580f35 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 5da8c067d3c..4c8f0dee364 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr "နိုဝင်ဘာ"
 msgid "December"
 msgstr "ဒီဇင်ဘာ"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "ယနေ့"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "ပယ်ဖျက်မည်"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -411,19 +410,19 @@ msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -537,6 +536,18 @@ 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 ""
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index 33dff51d05e..d9b7a04a282 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: my_MM\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -305,113 +297,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
index 0d76912418d..ba5148a5743 100644
--- a/l10n/my_MM/files_external.po
+++ b/l10n/my_MM/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "သုံးစွဲသူ"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 93cefaec22a..69bc9a0a977 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "ဖိုင်သို့ပြန်သွားမည်"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr "မနှစ်က"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "နှစ် အရင်က"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 9528baa22ee..e40126e75ae 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "လုံခြုံရေးသတိပေးချက်"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index f168578c576..e251fa3611f 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 25e46008d63..5a72ebdb028 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # onionhead <brthomassen@gmail.com>, 2013
+# espenbye <espenbye@me.com>, 2014
 # 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -20,36 +21,27 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Klarte ikke å sende mail til følgende brukere: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Slo på vedlikeholdsmodus"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Slo av vedlikeholdsmodus"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 msgid "Updated database"
 msgstr "Oppdaterte databasen"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Oppdaterer fil-cache. Dette kan ta veldig lang tid..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Oppdaterte fil-cache"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% ferdig ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Bilde eller fil ikke angitt"
@@ -146,63 +138,63 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Lagrer..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "år siden"
 
@@ -241,42 +233,50 @@ msgid "One file conflict"
 msgstr "En filkonflikt"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Hvilke filer vil du beholde?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Fortsett"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(alle valgt)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} valgt)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Feil ved lasting av \"filen eksisterer\"-mal"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Veldig svakt passord"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Svakt passord"
 
 #: js/setup.js:86
 msgid "So-so password"
@@ -284,11 +284,11 @@ msgstr ""
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Bra passord"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Sterkt passord"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -299,11 +299,11 @@ msgid "Share"
 msgstr "Del"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
@@ -419,19 +419,19 @@ msgstr "Passordbeskyttet"
 msgid "Error unsetting expiration date"
 msgstr "Feil ved nullstilling av utløpsdato"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -545,6 +545,18 @@ msgstr "Nytt passord"
 msgid "Reset password"
 msgstr "Tilbakestill passord"
 
+#: 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 "Personlig"
@@ -665,7 +677,7 @@ msgstr "opprett en <strong>administrator-konto</strong>"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Lagring og database"
 
 #: templates/installation.php:77
 msgid "Data folder"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 8b237c5697f..abaede9501c 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -21,48 +21,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Ikke en gyldig kilde"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -72,74 +72,74 @@ msgstr "Serveren har ikke lov til å åpne URL-er. Sjekk konfigurasjon av server
 msgid "Error while downloading %s to %s"
 msgstr "Feil ved nedlasting av %s til %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 msgid "Error when creating the file"
 msgstr "Feil ved oppretting av filen"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Mappenavn kan ikke være tomt."
 
-#: ajax/newfolder.php:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Feil ved oppretting av mappen"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Kunne ikke sette opplastingskatalog."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Ugyldig nøkkel"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ingen filer ble lastet opp"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Mangler midlertidig mappe"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Klarte ikke å skrive til disk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Ikke nok lagringsplass"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Opplasting feilet. Fant ikke opplastet fil."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Opplasting feilet. Klarte ikke å finne informasjon om fil."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Ugyldig katalog."
 
@@ -160,92 +160,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Fikk ikke resultat fra serveren."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL kan ikke være tom"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "I hjemmemappen er 'Shared' et reservert filnavn"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Klarte ikke å opprette fil"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Klarte ikke å opprette mappe"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Feil ved henting av URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Feil ved flytting av fil"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Feil"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Feil ved sletting av fil."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} og {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laster opp %n fil"
@@ -282,29 +282,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine."
 
-#: js/files.js:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Feil ved flytting av fil"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Feil"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Endret"
 
@@ -312,113 +304,109 @@ msgstr "Endret"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Ulovlig mappenavn. Bruken av 'Shared' er reservert."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Kunne ikke gi nytt navn til %s"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Last opp"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Filhåndtering"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimum opplastingsstørrelse"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. mulige:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Nødvendig for å laste ned mapper og mer enn én fil om gangen."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Aktiver nedlasting av ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 er ubegrenset"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimal størrelse på ZIP-filer"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Ny tekstfil"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Slettede filer"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "Du har ikke tillatelse til å laste opp eller opprette filer her"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Filen er for stor"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Skanner filer, vennligst vent."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/nb_NO/files_external.po
index 91b4ca93914..7e1d6afab9b 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet."
 msgid "Error configuring Google Drive storage"
 msgstr "Feil med konfigurering av Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
+msgstr "Lagret"
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Ekstern lagring"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Mappenavn"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Ekstern lagringsplass"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Innstillinger"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Anvendelig"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Legg til lagringsplass"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ingen valgt"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Alle brukere"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Brukere"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Aktiver ekstern lagring for bruker"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL root-sertifikater"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importer root-sertifikat"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index cddd41ceeac..896430174f2 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -67,23 +67,23 @@ msgstr "Ugyldig bilde"
 msgid "web services under your control"
 msgstr "web tjenester du kontrollerer"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslått"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Filene må lastes ned en om gangen"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -194,8 +194,8 @@ msgid "MS SQL username and/or password not valid: %s"
 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
+#: 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 må legge inn enten en eksisterende konto eller administratoren."
 
@@ -208,9 +208,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 "Databasefeil: \"%s\""
@@ -219,9 +219,9 @@ msgstr "Databasefeil: \"%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 "Kommandoen som feilet: \"%s\""
@@ -257,7 +257,7 @@ msgstr "Oracle-brukernavn og/eller passord er ikke gyldig"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Kommando som feilet: \"%s\", navn: %s, passord: %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-brukernavn og/eller passord er ikke gyldig"
 
@@ -269,19 +269,19 @@ msgstr "Sett et admin-brukernavn."
 msgid "Set an admin password."
 msgstr "Sett et admin-passord."
 
-#: private/setup.php:198
+#: 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 nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s delte »%s« med deg"
@@ -338,3 +338,21 @@ msgstr "forrige år"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "år siden"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Oppgi et gyldig brukernavn"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Oppgi et gyldig passord"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 4b481cd3dcb..5a36f04ddb2 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: espenbye <espenbye@me.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Lagret"
 
 #: admin/controller.php:90
 msgid "test email settings"
@@ -51,15 +51,15 @@ msgstr "E-post sendt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -68,7 +68,7 @@ msgid "Unable to load list from App Store"
 msgstr "Lasting av liste fra App Store feilet."
 
 #: 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 "Autentiseringsfeil"
 
@@ -130,38 +130,38 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
 msgid "Couldn't update app."
 msgstr "Kunne ikke oppdatere app."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Feil passord"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Ingen bruker angitt"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen."
 
-#: 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 "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Kunne ikke endre passord"
 
 #: js/admin.js:73
 msgid "Sending..."
-msgstr ""
+msgstr "Sender..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -207,7 +207,7 @@ msgstr "Feil ved oppdatering av app"
 msgid "Error"
 msgstr "Feil"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Oppdater"
 
@@ -215,17 +215,17 @@ msgstr "Oppdater"
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Velg et profilbilde"
 
 #: js/personal.js:274
 msgid "Very weak password"
-msgstr ""
+msgstr "Veldig svakt passord"
 
 #: js/personal.js:275
 msgid "Weak password"
-msgstr ""
+msgstr "Svakt passord"
 
 #: js/personal.js:276
 msgid "So-so password"
@@ -233,13 +233,13 @@ msgstr ""
 
 #: js/personal.js:277
 msgid "Good password"
-msgstr ""
+msgstr "Bra passord"
 
 #: js/personal.js:278
 msgid "Strong password"
-msgstr ""
+msgstr "Sterkt passord"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterer filer... Vennligst vent, dette kan ta litt tid."
 
@@ -288,7 +288,7 @@ msgstr "Oppgi et gyldig passord"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -330,24 +330,24 @@ msgstr ""
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "Du aksesserer %s via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve bruk av HTTPS i stedet."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -356,68 +356,68 @@ msgid ""
 "root."
 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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Installasjonsadvarsel"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Vennligst dobbeltsjekk <a href=\"%s\">installasjonsveilederne</a>."
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen 'fileinfo' mangler"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Din PHP-versjon er udatert"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "PHP-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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Språk virker ikke"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8."
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Dette betyr at det kan forekomme problemer med visse tegn i filnavn."
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "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:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Ingen internettilkopling"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -426,162 +426,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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 registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http."
 
-#: templates/admin.php:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Bruk systemets cron-tjeneste for å kalle cron.php hvert 15. minutt."
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktiver API for Deling"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Tillat apps å bruke API for Deling"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Tillat lenker"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Tillat brukere å dele filer offentlig med lenker"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Tillat offentlig opplasting"
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Tillat at brukere lar andre laste opp til deres offentlig delte mapper"
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "TIllat videredeling"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Tillat brukere å dele med alle"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Tillat påminnelser i e-post"
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Tillat at brukere sender epost-påminnelser for delte filer"
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Tving HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tvinger klientene til å koble til %s via en kryptert forbindelse."
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
-msgstr ""
+msgstr "Fra adresse"
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Server-adresse"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP-brukernavn"
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP-passord"
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
-msgstr ""
+msgstr "Send e-post"
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -599,23 +615,23 @@ msgstr "Legg til din App"
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Velg en app"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "Dokumentasjon:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikasjonens side på apps.owncloud.org"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>"
 
@@ -652,108 +668,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Passord har blitt endret"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Kunne ikke endre passordet ditt"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Nåværende passord"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Epost"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilbilde"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Last opp nytt"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Velg nytt fra Filer"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Fjern bilde"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Avataren din kommer fra din opprinnelige konto."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Velg som profilbilde"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>"
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine"
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Innloggingspassord"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle filer"
 
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index ae84487d1bb..50adfe578c7 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -420,41 +420,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Spesielle attributter"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Felt med lagringskvote"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Standard lagringskvote"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Felt med e-postadresse"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Navneregel for brukers hjemmemappe"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Internt brukernavn"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "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
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Attributt for internt brukernavn:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Overstyr UUID-oppdaging"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 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
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID-attributt for brukere:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-attributt for grupper:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Tilknytning av brukernavn til LDAP-bruker"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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 "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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Nullstill tilknytning av brukernavn til LDAP-bruker"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Nullstill tilknytning av gruppenavn til LDAP-gruppe"
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index 714f763aa83..93b4795b345 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/nds/files.po b/l10n/nds/files.po
index 0a2a0f0ee49..734a69de904 100644
--- a/l10n/nds/files.po
+++ b/l10n/nds/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: nds\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/nds/files_external.po b/l10n/nds/files_external.po
index 0cbcb8aaa13..05dd53ee1cb 100644
--- a/l10n/nds/files_external.po
+++ b/l10n/nds/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nds/lib.po b/l10n/nds/lib.po
index f44dacaa1ca..7f0a19e84b6 100644
--- a/l10n/nds/lib.po
+++ b/l10n/nds/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po
index 72cef409fc8..5224f83aa48 100644
--- a/l10n/nds/settings.po
+++ b/l10n/nds/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/nds/user_ldap.po b/l10n/nds/user_ldap.po
index 66bc16b25d8..87f72df86c2 100644
--- a/l10n/nds/user_ldap.po
+++ b/l10n/nds/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index ad4938a5f76..be84d374419 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 28691ff9aea..a36e68e7d45 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ne\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
index f42bf8b71d4..7e38ed50b9b 100644
--- a/l10n/ne/files_external.po
+++ b/l10n/ne/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 92e6df5e03a..e310cb1d413 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 12d2b048d84..45cc088491c 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 8d19c156bd5..2837bbbb4c5 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index e52f623de06..04323503230 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 18:11+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 08:00+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,36 +20,27 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "De vervaldatum ligt in het verleden."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kon geen e-mail sturen aan de volgende gebruikers: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Onderhoudsmodus ingeschakeld"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Onderhoudsmodus uitgeschakeld"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -146,63 +137,63 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Opslaan"
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minuten geleden"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n uur geleden"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n dagen geleden"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n maanden geleden"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -241,32 +232,40 @@ msgid "One file conflict"
 msgstr "Een bestandsconflict"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nieuwe bestanden"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr "Al aanwezige bestanden"
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Welke bestanden wilt u bewaren?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Verder"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(alles geselecteerd)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} geselecteerd)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Fout bij laden bestand bestaat al sjabloon"
 
@@ -299,11 +298,11 @@ msgid "Share"
 msgstr "Delen"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fout"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
@@ -419,19 +418,19 @@ msgstr "Wachtwoord beveiligd"
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -545,6 +544,18 @@ msgstr "Nieuw wachtwoord"
 msgid "Reset password"
 msgstr "Reset wachtwoord"
 
+#: 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 OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!"
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 2231577f3f1..1ce4270a6a9 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 18:21+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +19,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Bestandsnaam kan niet leeg zijn."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" is een ongeldige bestandsnaam."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
 msgstr "De doelmap is verplaatst of verwijderd."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Geen geldige bron"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -70,74 +70,74 @@ msgstr "Server mag geen URS's openen, controleer de server configuratie"
 msgid "Error while downloading %s to %s"
 msgstr "Fout bij downloaden %s naar %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fout bij aanmaken map"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Kan upload map niet instellen."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Ongeldig Token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Er was geen bestand geladen.  Onbekende fout"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "De upload van het bestand is goedgegaan."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is gedeeltelijk geüpload"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Er is geen bestand geüpload"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Er ontbreekt een tijdelijke map"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Niet genoeg opslagruimte beschikbaar"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload mislukt. Kon ge-uploade bestand niet vinden"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Upload mislukt, Kon geen bestandsinfo krijgen."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
@@ -158,92 +158,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL mag niet leeg zijn"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "in de home map 'Shared' is een gereserveerde bestandsnaam"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Kon bestand niet creëren"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Kon niet creëren map"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Fout bij ophalen URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Delen"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Fout bij verplaatsen bestand"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Fout"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "In behandeling"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Kon niet hernoemen bestand"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "verving {new_name} met {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "ongedaan maken"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Fout bij verwijderen bestand."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n mappen"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] "%n bestanden"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} en {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n bestand aan het uploaden"
@@ -280,29 +280,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Fout bij verplaatsen bestand"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Fout"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Aangepast"
 
@@ -310,113 +302,109 @@ msgstr "Aangepast"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Ongeldige mapnaam. Gebruik van 'Shared' is gereserveerd."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kon niet worden hernoemd"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Uploaden"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Bestand"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximale bestandsgrootte voor uploads"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. mogelijk: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Nodig voor meerdere bestanden en mappen downloads."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Zet ZIP-download aan"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 is ongelimiteerd"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale grootte voor ZIP bestanden"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Bewaren"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nieuw"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nieuw tekstbestand"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Tekstbestand"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Map"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Vanaf link"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Verwijderde bestanden"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Upload is te groot"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/nl/files_external.po
index a273cdb38f4..92ecf69764f 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 18:21+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 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"
@@ -38,91 +38,100 @@ msgstr "Geef een geldige Dropbox key en secret."
 msgid "Error configuring Google Drive storage"
 msgstr "Fout tijdens het configureren van Google Drive opslag"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Bewaard"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Let op:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr "en"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Externe opslag"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Mapnaam"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Externe opslag"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opties"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Van toepassing"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Beschikbaar voor"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Toevoegen opslag"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Niets ingesteld"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Geen gebruiker of groep"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Alle gebruikers"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Gebruikers"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Externe opslag voor gebruikers activeren"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Sta gebruikers toe de volgende externe opslag aan te koppelen"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL root certificaten"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importeer root certificaat"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index ac43d30ef84..35171905f80 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 18:21+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 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"
@@ -68,23 +68,23 @@ msgstr "Ongeldige afbeelding"
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten één voor één worden gedownload."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -195,8 +195,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %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 "Geef of een bestaand account op of het beheerdersaccount."
 
@@ -209,9 +209,9 @@ msgstr "MySQL/MariaDB gebruikersnaam en/of wachtwoord ongeldig"
 #: 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 Fout: \"%s\""
@@ -220,9 +220,9 @@ msgstr "DB Fout: \"%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 "Onjuiste commande was: \"%s\""
@@ -258,7 +258,7 @@ msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %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 gebruikersnaam en/of wachtwoord ongeldig"
 
@@ -270,19 +270,19 @@ msgstr "Stel de gebruikersnaam van de beheerder in."
 msgid "Set an admin password."
 msgstr "Stel een beheerderswachtwoord in."
 
-#: private/setup.php:198
+#: 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 "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s deelde »%s« met jou"
@@ -339,3 +339,21 @@ msgstr "vorig jaar"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "jaar geleden"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Alleen de volgende tekens zijn toegestaan in een gebruikersnaam: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Er moet een geldig wachtwoord worden opgegeven"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "De gebruikersnaam bestaat al"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index ebcab66a1af..0c10ccf3c4d 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 20:30+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -51,15 +51,15 @@ msgstr "E-mail verzonden"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Verstuurmodus"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Authenticatiemethode"
 
@@ -68,7 +68,7 @@ msgid "Unable to load list from App Store"
 msgstr "Kan de lijst niet van de App store laden"
 
 #: 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 "Authenticatie fout"
 
@@ -130,32 +130,32 @@ msgstr "Niet in staat om gebruiker te verwijderen uit groep %s"
 msgid "Couldn't update app."
 msgstr "Kon de app niet bijwerken."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Onjuist wachtwoord"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Geen gebruiker opgegeven"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw."
 
-#: 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 "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Kan wachtwoord niet wijzigen"
 
@@ -207,7 +207,7 @@ msgstr "Fout bij bijwerken app"
 msgid "Error"
 msgstr "Fout"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Bijwerken"
 
@@ -215,7 +215,7 @@ msgstr "Bijwerken"
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Kies een profielafbeelding"
 
@@ -239,7 +239,7 @@ msgstr "Goed wachtwoord"
 msgid "Strong password"
 msgstr "Sterk wachtwoord"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren."
 
@@ -288,7 +288,7 @@ msgstr "Er moet een geldig wachtwoord worden opgegeven"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -431,157 +431,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Delen"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activeren Share API"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Apps toestaan de Share API te gebruiken"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Toestaan links"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Sta publieke uploads toe"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Toestaan opnieuw delen"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Toestaan dat gebruikers met iedereen delen"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Toestaan e-mailnotificaties"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Beveiliging"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Afdwingen HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "E-mailserver"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Dit wordt gestuurd voor het verzenden van meldingen."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Afzenderadres"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Authenticatie vereist"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Server adres"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Poort"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Inloggegevens"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP gebruikersnaam"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP wachtwoord"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Test e-mailinstellingen"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Versturen e-mail"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -599,23 +615,23 @@ msgstr "App toevoegen"
 msgid "More Apps"
 msgstr "Meer apps"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Selecteer een app"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentatie:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Zie website van de applicatie"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>"
 
@@ -652,108 +668,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Je wachtwoord is veranderd"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Niet in staat om uw wachtwoord te wijzigen"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nieuw"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profielafbeelding"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Upload een nieuwe"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Selecteer een nieuwe vanuit bestanden"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Verwijder afbeelding"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Uw avatar is verstrekt door uw originele account."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Kies als profielafbeelding"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Inlog-wachtwoord"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Decodeer alle bestanden"
 
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index d3f5eb8d77f..9a66b674e93 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 18:30+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 08:10+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"
@@ -422,41 +422,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Paging chunkgrootte"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "De chunkgrootte die wordt gebruikt voor LDAP opvragingen die in grote aantallen resulteren, zoals gebruiker- of groepsverzamelingen. (Instellen op 0 deactiveert gepagede LDAP opvragingen in dergelijke situaties.)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Speciale attributen"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Quota veld"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Quota standaard"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-mailveld"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Gebruikers Home map naamgevingsregel"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Interne gebruikersnaam"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -472,15 +483,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Interne gebruikersnaam attribuut:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Negeren UUID detectie"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID attribuut voor gebruikers:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID attribuut voor groepen:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -517,10 +528,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 ca78faa2449..6b639db57e0 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -20,36 +20,27 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 "Skrudde på vedlikehaldsmodus"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Skrudde av vedlikehaldsmodus"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -146,63 +137,63 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Lagrar …"
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt sidan"
 msgstr[1] "%n minutt sidan"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time sidan"
 msgstr[1] "%n timar sidan"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sidan"
 msgstr[1] "%n dagar sidan"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "førre månad"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sidan"
 msgstr[1] "%n månadar sidan"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "månadar sidan"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "år sidan"
 
@@ -241,32 +232,40 @@ msgid "One file conflict"
 msgstr "Éin filkonflikt"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Kva filer vil du spara?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Gå vidare"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(alle valte)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} valte)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Klarte ikkje å lasta fil-finst-mal"
 
@@ -299,11 +298,11 @@ msgid "Share"
 msgstr "Del"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
@@ -419,19 +418,19 @@ msgstr "Passordverna"
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Åtvaring"
 
@@ -545,6 +544,18 @@ msgstr "Nytt passord"
 msgid "Reset password"
 msgstr "Nullstill passord"
 
+#: 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 "Personleg"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 351295c01f1..9abd909682b 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -20,48 +20,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Filnamnet kan ikkje vera tomt."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -71,74 +71,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Klarte ikkje å endra opplastingsmappa."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Ugyldig token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer lasta opp. Ukjend feil"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Ingen feil, fila vart lasta opp"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fila vart berre delvis lasta opp"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ingen filer vart lasta opp"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Manglar ei mellombels mappe"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Klarte ikkje skriva til disk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Feil ved opplasting. Klarte ikkje å finna opplasta fil."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -159,92 +159,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Opplasting avbroten."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Klarte ikkje å henta resultat frå tenaren."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Slett for godt"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Feil ved flytting av fil"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Feil"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "bytte ut {new_name} med {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "angre"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} og {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lastar opp %n fil"
@@ -281,29 +281,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Feil ved flytting av fil"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Feil"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Endra"
 
@@ -311,113 +303,109 @@ msgstr "Endra"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Klarte ikkje å omdøypa på %s"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Last opp"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Filhandtering"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimal opplastingsstorleik"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maks. moglege:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Nødvendig for fleirfils- og mappenedlastingar."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Slå på ZIP-nedlasting"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 er ubegrensa"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimal storleik for ZIP-filer"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Tekst fil"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Frå lenkje"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Sletta filer"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Skannar filer, ver venleg og vent."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/nn_NO/files_external.po
index 6fe360ef9ed..b759063902e 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Innstillingar"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Brukarar"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index c38e2360ed2..5f7f37471b4 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -67,23 +67,23 @@ msgstr "Ugyldig bilete"
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -194,8 +194,8 @@ 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 ""
 
@@ -208,9 +208,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,9 +219,9 @@ 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 ""
@@ -257,7 +257,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,19 +269,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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 "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s delte «%s» med deg"
@@ -338,3 +338,21 @@ msgstr "i fjor"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "år sidan"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Du må oppgje eit gyldig brukarnamn"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Du må oppgje eit gyldig passord"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index a9924e80428..f0a4f6ec449 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -50,15 +50,15 @@ msgstr "E-post sendt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgid "Unable to load list from App Store"
 msgstr "Klarer ikkje å lasta inn liste fra app-butikken"
 
 #: 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 "Autentiseringsfeil"
 
@@ -129,32 +129,32 @@ msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
 msgid "Couldn't update app."
 msgstr "Klarte ikkje oppdatera programmet."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Feil passord"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Ingen brukar gitt"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt."
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen."
 
-#: 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 "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Klarte ikkje å endra passordet"
 
@@ -206,7 +206,7 @@ msgstr "Feil ved oppdatering av app"
 msgid "Error"
 msgstr "Feil"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Oppdater"
 
@@ -214,7 +214,7 @@ msgstr "Oppdater"
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Vel eit profilbilete"
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
 
@@ -287,7 +287,7 @@ msgstr "Du må oppgje eit gyldig passord"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -335,18 +335,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Tryggleiksåtvaring"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -355,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Oppsettsåtvaring"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen «fileinfo» manglar"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Regionaldata fungerer ikkje"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Nettilkoplinga fungerer ikkje"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -425,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Slå på API-et for deling"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "La app-ar bruka API-et til deling"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Tillat lenkjer"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Tillat offentlege opplastingar"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Tillat vidaredeling"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "La brukarar vidaredela delte ting"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "La brukarar dela med kven som helst"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Tenaradresse"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log nivå"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Utgåve"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -598,23 +614,23 @@ msgstr "Legg til din app"
 msgid "More Apps"
 msgstr "Fleire app-ar"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Vel eit program"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Sjå programsida på apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>"
 
@@ -651,108 +667,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Passordet ditt er endra"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Klarte ikkje endra passordet"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Di epost-adresse"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilbilete"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Last opp ny"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Vel ny frå Filer"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Fjern bilete"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Vel som profilbilete"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Hjelp oss å omsetja"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Innloggingspassord"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle filene"
 
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 480d38d38db..403a8918af4 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 90bae6db342..ebd63b4cd6b 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -411,19 +410,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -537,6 +536,18 @@ 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 ""
diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po
index 0941d906902..abf737189e4 100644
--- a/l10n/nqo/files.po
+++ b/l10n/nqo/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: nqo\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -305,113 +297,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/nqo/files_external.po b/l10n/nqo/files_external.po
index 144a1d0bff7..12b0618ce14 100644
--- a/l10n/nqo/files_external.po
+++ b/l10n/nqo/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po
index 27ffc71bf38..0571ed36a4e 100644
--- a/l10n/nqo/lib.po
+++ b/l10n/nqo/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
index b476081f955..9845d1695c9 100644
--- a/l10n/nqo/settings.po
+++ b/l10n/nqo/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po
index 19a09572685..aa3ecec450f 100644
--- a/l10n/nqo/user_ldap.po
+++ b/l10n/nqo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 590cd815944..27973e1d237 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Enregistra..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "ans a"
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Annula"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr "Parteja"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
@@ -416,19 +415,19 @@ msgstr "Parat per senhal"
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ msgstr "Senhal novèl"
 msgid "Reset password"
 msgstr "Senhal tornat botar"
 
+#: 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 "Personal"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index b7d6846e341..b957e1ad486 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Amontcargament capitat, pas d'errors"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lo fichièr foguèt pas completament amontcargat"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Cap de fichièrs son estats amontcargats"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Un dorsièr temporari manca"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "L'escriptura sul disc a fracassat"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Parteja"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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 "defar"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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 "Error"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificat"
 
@@ -308,113 +300,109 @@ msgstr "Modificat"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Amontcarga"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Manejament de fichièr"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Talha maximum d'amontcargament"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. possible: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Requesit per avalcargar gropat de fichièrs e dorsièr"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Activa l'avalcargament de ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 es pas limitat"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Talha maximum de dintrada per fichièrs ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Enregistra"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nòu"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Fichièr de tèxte"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Dorsièr"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Escafa"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Amontcargament tròp gròs"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichièrs son a èsser explorats, "
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Exploracion en cors"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index 827bfb5aa74..3814886f94d 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grops"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Usancièrs"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Escafa"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index a753c847934..7883c2348cd 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "Services web jos ton contraròtle"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Avalcargar los ZIP es inactiu."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Los fichièrs devan èsser avalcargats un per un."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Torna cap als fichièrs"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "an passat"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "ans a"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 653448bf2b5..d71b89eca0a 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Avertiment de securitat"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Al partejar"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activa API partejada"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Jornal"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mai d'aquò"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 40d6de703ce..5bf21b613f8 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index 068fbb14e86..622bfea68c3 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,63 +135,63 @@ msgstr "ਨਵੰਬ"
 msgid "December"
 msgstr "ਦਸੰਬਰ"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "ਸੈਟਿੰਗ"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "ਅੱਜ"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ਕੱਲ੍ਹ"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "ਪਿਛਲੇ ਸਾਲ"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr "ਸਾਂਝਾ ਕਰੋ"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "ਗਲ"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -417,19 +416,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
@@ -543,6 +542,18 @@ 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 ""
diff --git a/l10n/pa/files.po b/l10n/pa/files.po
index edfe9d88b12..f991fea8626 100644
--- a/l10n/pa/files.po
+++ b/l10n/pa/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: pa\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "ਸਾਂਝਾ ਕਰੋ"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "ਨਾਂ ਬਦਲੋ"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "ਗਲਤੀ"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
-msgstr "ਵਾਪਸ"
+#: js/filelist.js:630
+msgid "Could not rename file"
+msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "ਅੱਪਲੋਡ"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "ਡਾਊਨਲੋਡ"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/pa/files_external.po b/l10n/pa/files_external.po
index f72e18ae57a..48a189abb1e 100644
--- a/l10n/pa/files_external.po
+++ b/l10n/pa/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "ਗਰੁੱਪ"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po
index 3977deb38b0..cc8806e357e 100644
--- a/l10n/pa/lib.po
+++ b/l10n/pa/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "ਪਿਛਲੇ ਸਾਲ"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po
index 72e4853611e..8f1df1750df 100644
--- a/l10n/pa/settings.po
+++ b/l10n/pa/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -212,31 +212,31 @@ msgstr ""
 msgid "Updated"
 msgstr "ਅੱਪਡੇਟ ਕੀਤਾ"
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "ਸਰਵਰ ਐਡਰੈਸ"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po
index 1baf1bc601a..37579bfed80 100644
--- a/l10n/pa/user_ldap.po
+++ b/l10n/pa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 8beb2e914b4..b59c87df678 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -5,15 +5,15 @@
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 # maxxx <maxxxrally@gmail.com>, 2014
-# bobie <maciej.przybecki@gmail.com>, 2013
+# 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: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 07:21+0000\n"
-"Last-Translator: maxxx <maxxxrally@gmail.com>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:02+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"
@@ -21,36 +21,27 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Data wygaśnięcia jest w przeszłości"
+
+#: ajax/share.php:119 ajax/share.php:161
 #, 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"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Włączony tryb konserwacji"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Wyłączony tryb konserwacji"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -147,67 +138,67 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Grudzień"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:996
+#: js/js.js:1125
 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:997
+#: js/js.js:1126
 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:998
+#: js/js.js:1127
 msgid "today"
 msgstr "dziś"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:1000
+#: js/js.js:1129
 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:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: js/js.js:1002
+#: js/js.js:1131
 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:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "lat temu"
 
@@ -247,32 +238,40 @@ msgid "One file conflict"
 msgstr "Konflikt pliku"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nowe pliki"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr "Już istniejące pliki"
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Które pliki chcesz zachować?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Kontynuuj "
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(wszystkie zaznaczone)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} zaznaczonych)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Błąd podczas ładowania szablonu istniejącego pliku"
 
@@ -305,11 +304,11 @@ msgid "Share"
 msgstr "Udostępnij"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Błąd"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Błąd podczas współdzielenia"
 
@@ -425,19 +424,19 @@ msgstr "Zabezpieczone hasłem"
 msgid "Error unsetting expiration date"
 msgstr "Błąd podczas usuwania daty wygaśnięcia"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Wysyłanie..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail wysłany"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -551,6 +550,18 @@ msgstr "Nowe hasło"
 msgid "Reset password"
 msgstr "Zresetuj hasło"
 
+#: 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 nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!"
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 8c1ba709586..068fbdf5b67 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-16 03:12-0400\n"
-"PO-Revision-Date: 2014-03-15 14:59+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +23,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/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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" jest nieprawidłową nazwą pliku."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
 msgstr "Folder docelowy został przeniesiony lub usunięty"
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Niepoprawne źródło"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -74,74 +74,74 @@ msgstr "Serwer nie mógł otworzyć adresów URL, należy sprawdzić konfiguracj
 msgid "Error while downloading %s to %s"
 msgstr "Błąd podczas pobierania %s do %S"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Błąd przy tworzeniu folderu"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Nie można ustawić katalog wczytywania."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Nieprawidłowy Token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Żaden plik nie został załadowany. Nieznany błąd"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Nie było błędów, plik wysłano poprawnie."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Załadowany plik został wysłany tylko częściowo."
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nie wysłano żadnego pliku"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Brak folderu tymczasowego"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Błąd zapisu na dysk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Za mało dostępnego miejsca"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
@@ -162,94 +162,94 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Nie można uzyskać wyniku z serwera."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL nie może być pusty"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "W katalogu domowym \"Shared\" jest zarezerwowana nazwa pliku"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Nie można utworzyć pliku"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Nie można utworzyć folderu"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Błąd przy pobieraniu adresu URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Trwale usuń"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Błąd prz przenoszeniu pliku"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Błąd"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Oczekujące"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Nie można zmienić nazwy pliku"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "zastąpiono {new_name} przez {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "cofnij"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Błąd podczas usuwania pliku"
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n katalog"
 msgstr[1] "%n katalogi"
 msgstr[2] "%n katalogów"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n plik"
 msgstr[1] "%n pliki"
 msgstr[2] "%n plików"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} i {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Wysyłanie %n pliku"
@@ -287,29 +287,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Błąd prz przenoszeniu pliku"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Błąd"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modyfikacja"
 
@@ -317,113 +309,109 @@ msgstr "Modyfikacja"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Niepoprawna nazwa folderu. Wykorzystanie \"Shared\" jest zarezerwowane."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nie można zmienić nazwy"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Wyślij"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Zarządzanie plikami"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksymalny rozmiar wysyłanego pliku"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maks. możliwy:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Wymagany do pobierania wielu plików i folderów"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Włącz pobieranie ZIP-paczki"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 - bez limitów"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Zapisz"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nowy"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nowy plik tekstowy"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Plik tekstowy"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nowy folder"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Z odnośnika"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Pliki usunięte"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Anuluj wysyłanie"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Pusto. Wyślij coś!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Ładowany plik jest za duży"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/pl/files_external.po
index 6b6c8c03df7..ea9e5451478 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-16 03:12-0400\n"
-"PO-Revision-Date: 2014-03-15 15:10+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 10:53+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"
@@ -39,91 +39,100 @@ msgstr "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny."
 msgid "Error configuring Google Drive storage"
 msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Zapisano"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Uwaga:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr "oraz"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Zewnętrzna zasoby dyskowe"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nazwa folderu"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Zewnętrzne zasoby dyskowe"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opcje"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Zastosowanie"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Dostępne przez"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Dodaj zasoby dyskowe"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nie ustawione"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Brak użytkownika lub grupy"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Wszyscy uzytkownicy"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Włącz zewnętrzne zasoby dyskowe użytkownika"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 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:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Główny certyfikat SSL"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importuj główny certyfikat"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 801c5b51c9c..35e7c37ef0a 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-16 03:12-0400\n"
-"PO-Revision-Date: 2014-03-15 15:10+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 10:53+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"
@@ -67,23 +67,23 @@ msgstr "Błędne zdjęcie"
 msgid "web services under your control"
 msgstr "Kontrolowane serwisy"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyłączone."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszą zostać pobrane pojedynczo."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Wróć do plików"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -269,19 +269,19 @@ msgstr "Ustaw nazwę administratora."
 msgid "Set an admin password."
 msgstr "Ustaw hasło administratora."
 
-#: private/setup.php:198
+#: 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 "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s Współdzielone »%s« z tobą"
@@ -342,3 +342,21 @@ msgstr "w zeszłym roku"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "lat temu"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "W nazwach użytkowników dozwolone są wyłącznie następujące znaki: \"a-z\", \"A-Z\", \"0-9\", oraz \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Należy podać prawidłową nazwę użytkownika"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Należy podać prawidłowe hasło"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Ta nazwa użytkownika jest już używana"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 0da46ce25da..8c1c418c8e7 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-16 03:12-0400\n"
-"PO-Revision-Date: 2014-03-15 15:20+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06: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"
@@ -50,15 +50,15 @@ msgstr "E-mail wysłany"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Tryb wysyłki"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Metoda autentykacji"
 
@@ -67,7 +67,7 @@ msgid "Unable to load list from App Store"
 msgstr "Nie można wczytać listy aplikacji"
 
 #: 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 "Błąd uwierzytelniania"
 
@@ -129,32 +129,32 @@ msgstr "Nie można usunąć użytkownika z grupy %s"
 msgid "Couldn't update app."
 msgstr "Nie można uaktualnić aplikacji."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Złe hasło"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Niedostarczony użytkownik"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie."
 
-#: 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 "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Nie można zmienić hasła"
 
@@ -206,7 +206,7 @@ msgstr "Błąd podczas aktualizacji aplikacji"
 msgid "Error"
 msgstr "Błąd"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Aktualizuj"
 
@@ -214,31 +214,31 @@ msgstr "Aktualizuj"
 msgid "Updated"
 msgstr "Zaktualizowano"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Wybierz zdjęcie profilu"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Bardzo słabe hasło"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Słabe hasło"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "Mało skomplikowane hasło"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Dobre hasło"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Mocne hasło"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
 
@@ -287,7 +287,7 @@ msgstr "Należy podać prawidłowe hasło"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "polski"
 
@@ -430,157 +430,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Udostępnianie"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Włącz API udostępniania"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Zezwalaj na odnośniki"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Pozwól na  publiczne wczytywanie"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Zezwalaj na ponowne udostępnianie"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Pozwól na mailowe powiadomienia"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Wymuś HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Serwer pocztowy"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "To jest używane do wysyłania powiadomień"
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Z adresu"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Wymagana autoryzacja"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adres Serwera"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Poświadczenia"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Użytkownik SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Hasło SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Ustawienia testowej wiadomości"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Wyślij email"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Więcej"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -598,23 +614,23 @@ msgstr "Dodaj swoją aplikację"
 msgid "More Apps"
 msgstr "Więcej aplikacji"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Zaznacz aplikację"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Dokumentacja:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Zobacz na stronie aplikacji"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>"
 
@@ -651,108 +667,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Twoje hasło zostało zmienione"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Nie można zmienić hasła"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Bieżące hasło"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Pełna nazwa"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Twój adres e-mail"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Zdjęcie profilu"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Wczytaj nowe"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Wybierz nowe z plików"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Usuń zdjęcie"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Twój awatar jest ustawiony jako domyślny."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Wybierz zdjęcie profilu"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik"
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Hasło logowania"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Odszyfruj wszystkie pliki"
 
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index c0c5d208854..498a323e540 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 07:30+0000\n"
-"Last-Translator: maxxx <maxxxrally@gmail.com>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:02+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"
@@ -426,41 +426,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Wielkość stronicowania"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Długość łańcucha jest używana do stronicowanych wyszukiwań LDAP, które mogą zwracać duże zbiory jak lista grup, czy użytkowników. (Ustawienie na 0 wyłącza stronicowane wyszukiwania w takich sytuacjach.)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Specjalne atrybuty"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Pole przydziału"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Przydział domyślny"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "w bajtach"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Reguły nazewnictwa folderu domowego użytkownika"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Wewnętrzna nazwa użytkownika"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -476,15 +487,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna, a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Wewnętrzny atrybut nazwy uzżytkownika:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Zastąp wykrywanie UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -495,19 +506,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Atrybuty UUID dla użytkowników:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Atrybuty UUID dla grup:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Mapowanie użytkownika LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -521,10 +532,10 @@ msgid ""
 "experimental stage."
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Czyść Mapowanie użytkownika LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Czyść Mapowanie nazwy grupy LDAP"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
deleted file mode 100644
index 7b4ef7d09a1..00000000000
--- a/l10n/pl_PL/core.po
+++ /dev/null
@@ -1,617 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-04 02:29+0200\n"
-"PO-Revision-Date: 2013-06-03 00:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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:97
-#, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr ""
-
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr ""
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr ""
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr ""
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr ""
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr ""
-
-#: js/config.php:34
-msgid "Sunday"
-msgstr ""
-
-#: js/config.php:35
-msgid "Monday"
-msgstr ""
-
-#: js/config.php:36
-msgid "Tuesday"
-msgstr ""
-
-#: js/config.php:37
-msgid "Wednesday"
-msgstr ""
-
-#: js/config.php:38
-msgid "Thursday"
-msgstr ""
-
-#: js/config.php:39
-msgid "Friday"
-msgstr ""
-
-#: js/config.php:40
-msgid "Saturday"
-msgstr ""
-
-#: js/config.php:45
-msgid "January"
-msgstr ""
-
-#: js/config.php:46
-msgid "February"
-msgstr ""
-
-#: js/config.php:47
-msgid "March"
-msgstr ""
-
-#: js/config.php:48
-msgid "April"
-msgstr ""
-
-#: js/config.php:49
-msgid "May"
-msgstr ""
-
-#: js/config.php:50
-msgid "June"
-msgstr ""
-
-#: js/config.php:51
-msgid "July"
-msgstr ""
-
-#: js/config.php:52
-msgid "August"
-msgstr ""
-
-#: js/config.php:53
-msgid "September"
-msgstr ""
-
-#: js/config.php:54
-msgid "October"
-msgstr ""
-
-#: js/config.php:55
-msgid "November"
-msgstr ""
-
-#: js/config.php:56
-msgid "December"
-msgstr ""
-
-#: js/js.js:286
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: js/js.js:718
-msgid "seconds ago"
-msgstr ""
-
-#: js/js.js:719
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:720
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:721
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:722
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "today"
-msgstr ""
-
-#: js/js.js:724
-msgid "yesterday"
-msgstr ""
-
-#: js/js.js:725
-msgid "{days} days ago"
-msgstr ""
-
-#: js/js.js:726
-msgid "last month"
-msgstr ""
-
-#: js/js.js:727
-msgid "{months} months ago"
-msgstr ""
-
-#: js/js.js:728
-msgid "months ago"
-msgstr ""
-
-#: js/js.js:729
-msgid "last year"
-msgstr ""
-
-#: js/js.js:730
-msgid "years ago"
-msgstr ""
-
-#: js/oc-dialogs.js:117
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
-msgid "Error loading file picker template"
-msgstr ""
-
-#: js/oc-dialogs.js:164
-msgid "Yes"
-msgstr ""
-
-#: js/oc-dialogs.js:172
-msgid "No"
-msgstr ""
-
-#: js/oc-dialogs.js:185
-msgid "Ok"
-msgstr ""
-
-#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
-#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
-msgid "The object type is not specified."
-msgstr ""
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
-msgid "Error"
-msgstr ""
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr ""
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr ""
-
-#: js/share.js:30 js/share.js:45 js/share.js:87
-msgid "Shared"
-msgstr ""
-
-#: js/share.js:90
-msgid "Share"
-msgstr ""
-
-#: js/share.js:125 js/share.js:617
-msgid "Error while sharing"
-msgstr ""
-
-#: js/share.js:136
-msgid "Error while unsharing"
-msgstr ""
-
-#: js/share.js:143
-msgid "Error while changing permissions"
-msgstr ""
-
-#: js/share.js:152
-msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
-
-#: js/share.js:154
-msgid "Shared with you by {owner}"
-msgstr ""
-
-#: js/share.js:159
-msgid "Share with"
-msgstr ""
-
-#: js/share.js:164
-msgid "Share with link"
-msgstr ""
-
-#: js/share.js:167
-msgid "Password protect"
-msgstr ""
-
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
-msgid "Password"
-msgstr ""
-
-#: js/share.js:173
-msgid "Email link to person"
-msgstr ""
-
-#: js/share.js:174
-msgid "Send"
-msgstr ""
-
-#: js/share.js:178
-msgid "Set expiration date"
-msgstr ""
-
-#: js/share.js:179
-msgid "Expiration date"
-msgstr ""
-
-#: js/share.js:211
-msgid "Share via email:"
-msgstr ""
-
-#: js/share.js:213
-msgid "No people found"
-msgstr ""
-
-#: js/share.js:251
-msgid "Resharing is not allowed"
-msgstr ""
-
-#: js/share.js:287
-msgid "Shared in {item} with {user}"
-msgstr ""
-
-#: js/share.js:308
-msgid "Unshare"
-msgstr ""
-
-#: js/share.js:320
-msgid "can edit"
-msgstr ""
-
-#: js/share.js:322
-msgid "access control"
-msgstr ""
-
-#: js/share.js:325
-msgid "create"
-msgstr ""
-
-#: js/share.js:328
-msgid "update"
-msgstr ""
-
-#: js/share.js:331
-msgid "delete"
-msgstr ""
-
-#: js/share.js:334
-msgid "share"
-msgstr ""
-
-#: js/share.js:368 js/share.js:564
-msgid "Password protected"
-msgstr ""
-
-#: js/share.js:577
-msgid "Error unsetting expiration date"
-msgstr ""
-
-#: js/share.js:589
-msgid "Error setting expiration date"
-msgstr ""
-
-#: js/share.js:604
-msgid "Sending ..."
-msgstr ""
-
-#: js/share.js:615
-msgid "Email sent"
-msgstr ""
-
-#: js/update.js:14
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr ""
-
-#: js/update.js:18
-msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
-
-#: lostpassword/controller.php:48
-msgid "ownCloud password reset"
-msgstr ""
-
-#: lostpassword/templates/email.php:2
-msgid "Use the following link to reset your password: {link}"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: lostpassword/templates/lostpassword.php:21
-msgid "Request reset"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:5
-msgid "To login page"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:8
-msgid "New password"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:11
-msgid "Reset password"
-msgstr ""
-
-#: strings.php:5
-msgid "Personal"
-msgstr ""
-
-#: strings.php:6
-msgid "Users"
-msgstr ""
-
-#: strings.php:7
-msgid "Apps"
-msgstr ""
-
-#: strings.php:8
-msgid "Admin"
-msgstr ""
-
-#: strings.php:9
-msgid "Help"
-msgstr ""
-
-#: templates/403.php:12
-msgid "Access forbidden"
-msgstr ""
-
-#: templates/404.php:12
-msgid "Cloud not found"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr ""
-
-#: templates/installation.php:24 templates/installation.php:31
-#: templates/installation.php:38
-msgid "Security Warning"
-msgstr ""
-
-#: templates/installation.php:25
-msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
-
-#: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
-
-#: templates/installation.php:32
-msgid ""
-"No secure random number generator is available, please enable the PHP "
-"OpenSSL extension."
-msgstr ""
-
-#: templates/installation.php:33
-msgid ""
-"Without a secure random number generator an attacker may be able to predict "
-"password reset tokens and take over your account."
-msgstr ""
-
-#: templates/installation.php:39
-msgid ""
-"Your data directory and files are probably accessible from the internet "
-"because the .htaccess file does not work."
-msgstr ""
-
-#: templates/installation.php:40
-msgid ""
-"For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr ""
-
-#: templates/installation.php:44
-msgid "Create an <strong>admin account</strong>"
-msgstr ""
-
-#: templates/installation.php:62
-msgid "Advanced"
-msgstr ""
-
-#: templates/installation.php:64
-msgid "Data folder"
-msgstr ""
-
-#: templates/installation.php:74
-msgid "Configure the database"
-msgstr ""
-
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
-msgid "will be used"
-msgstr ""
-
-#: templates/installation.php:137
-msgid "Database user"
-msgstr ""
-
-#: templates/installation.php:144
-msgid "Database password"
-msgstr ""
-
-#: templates/installation.php:149
-msgid "Database name"
-msgstr ""
-
-#: templates/installation.php:159
-msgid "Database tablespace"
-msgstr ""
-
-#: templates/installation.php:166
-msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:172
-msgid "Finish setup"
-msgstr ""
-
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:37
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:62
-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:34
-msgid "Lost your password?"
-msgstr ""
-
-#: templates/login.php:39
-msgid "remember"
-msgstr ""
-
-#: templates/login.php:41
-msgid "Log in"
-msgstr ""
-
-#: templates/login.php:47
-msgid "Alternative Logins"
-msgstr ""
-
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
-#: templates/update.php:3
-#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
deleted file mode 100644
index be28fc5ba39..00000000000
--- a/l10n/pl_PL/files.po
+++ /dev/null
@@ -1,322 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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
-#, php-format
-msgid "Could not move %s - File with this name already exists"
-msgstr ""
-
-#: ajax/move.php:27 ajax/move.php:30
-#, php-format
-msgid "Could not move %s"
-msgstr ""
-
-#: ajax/upload.php:19
-msgid "No file was uploaded. Unknown error"
-msgstr ""
-
-#: ajax/upload.php:26
-msgid "There is no error, the file uploaded with success"
-msgstr ""
-
-#: ajax/upload.php:27
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
-
-#: ajax/upload.php:29
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr ""
-
-#: ajax/upload.php:30
-msgid "The uploaded file was only partially uploaded"
-msgstr ""
-
-#: ajax/upload.php:31
-msgid "No file was uploaded"
-msgstr ""
-
-#: ajax/upload.php:32
-msgid "Missing a temporary folder"
-msgstr ""
-
-#: ajax/upload.php:33
-msgid "Failed to write to disk"
-msgstr ""
-
-#: ajax/upload.php:51
-msgid "Not enough storage available"
-msgstr ""
-
-#: ajax/upload.php:83
-msgid "Invalid directory."
-msgstr ""
-
-#: appinfo/app.php:12
-msgid "Files"
-msgstr ""
-
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
-msgid "Delete permanently"
-msgstr ""
-
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr ""
-
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
-msgid "Pending"
-msgstr ""
-
-#: js/filelist.js:259 js/filelist.js:261
-msgid "{new_name} already exists"
-msgstr ""
-
-#: js/filelist.js:259 js/filelist.js:261
-msgid "replace"
-msgstr ""
-
-#: js/filelist.js:259
-msgid "suggest name"
-msgstr ""
-
-#: js/filelist.js:259 js/filelist.js:261
-msgid "cancel"
-msgstr ""
-
-#: js/filelist.js:306
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:306
-msgid "undo"
-msgstr ""
-
-#: js/filelist.js:331
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:413
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:416 js/filelist.js:470
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
-msgid "'.' is an invalid file name."
-msgstr ""
-
-#: js/files.js:56
-msgid "File name cannot be empty."
-msgstr ""
-
-#: js/files.js:64
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:78
-msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
-
-#: js/files.js:82
-msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
-
-#: js/files.js:231
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr ""
-
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
-msgid "Name"
-msgstr ""
-
-#: js/files.js:878 templates/index.php:80
-msgid "Size"
-msgstr ""
-
-#: js/files.js:879 templates/index.php:82
-msgid "Modified"
-msgstr ""
-
-#: js/files.js:898
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:900
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:908
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:910
-msgid "{count} files"
-msgstr ""
-
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
-#: lib/app.php:73
-msgid "Unable to rename file"
-msgstr ""
-
-#: lib/helper.php:11 templates/index.php:18
-msgid "Upload"
-msgstr ""
-
-#: templates/admin.php:5
-msgid "File handling"
-msgstr ""
-
-#: templates/admin.php:7
-msgid "Maximum upload size"
-msgstr ""
-
-#: templates/admin.php:10
-msgid "max. possible: "
-msgstr ""
-
-#: templates/admin.php:15
-msgid "Needed for multi-file and folder downloads."
-msgstr ""
-
-#: templates/admin.php:17
-msgid "Enable ZIP-download"
-msgstr ""
-
-#: templates/admin.php:20
-msgid "0 is unlimited"
-msgstr ""
-
-#: templates/admin.php:22
-msgid "Maximum input size for ZIP files"
-msgstr ""
-
-#: templates/admin.php:26
-msgid "Save"
-msgstr "Zapisz"
-
-#: templates/index.php:7
-msgid "New"
-msgstr ""
-
-#: templates/index.php:10
-msgid "Text file"
-msgstr ""
-
-#: templates/index.php:12
-msgid "Folder"
-msgstr ""
-
-#: templates/index.php:14
-msgid "From link"
-msgstr ""
-
-#: templates/index.php:42
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:48
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/index.php:54
-msgid "You don’t have write permissions here."
-msgstr ""
-
-#: templates/index.php:61
-msgid "Nothing in here. Upload something!"
-msgstr ""
-
-#: templates/index.php:75
-msgid "Download"
-msgstr ""
-
-#: templates/index.php:87 templates/index.php:88
-msgid "Unshare"
-msgstr ""
-
-#: templates/index.php:107
-msgid "Upload too large"
-msgstr ""
-
-#: templates/index.php:109
-msgid ""
-"The files you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: templates/index.php:114
-msgid "Files are being scanned, please wait."
-msgstr ""
-
-#: templates/index.php:117
-msgid "Current scanning"
-msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/pl_PL/files_encryption.po b/l10n/pl_PL/files_encryption.po
deleted file mode 100644
index 6b66a61ef66..00000000000
--- a/l10n/pl_PL/files_encryption.po
+++ /dev/null
@@ -1,103 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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/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 ""
-
-#: js/settings-admin.js:11
-msgid "Saving..."
-msgstr ""
-
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
-msgid "Encryption"
-msgstr ""
-
-#: templates/settings-admin.php:9
-msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr ""
-
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr ""
-
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
-msgid "Enabled"
-msgstr ""
-
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
-msgid "Disabled"
-msgstr ""
-
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
-msgstr ""
-
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr ""
-
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr ""
-
-#: templates/settings-admin.php:51
-msgid "Change Password"
-msgstr ""
-
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr ""
-
-#: templates/settings-personal.php:11
-msgid ""
-"Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr ""
-
-#: templates/settings-personal.php:27
-msgid "File recovery settings updated"
-msgstr ""
-
-#: templates/settings-personal.php:28
-msgid "Could not update file recovery"
-msgstr ""
diff --git a/l10n/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
deleted file mode 100644
index be11b7a0268..00000000000
--- a/l10n/pl_PL/files_external.po
+++ /dev/null
@@ -1,123 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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:16 js/google.js:34
-msgid "Access granted"
-msgstr ""
-
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
-msgid "Error configuring Dropbox storage"
-msgstr ""
-
-#: js/dropbox.js:65 js/google.js:66
-msgid "Grant access"
-msgstr ""
-
-#: js/dropbox.js:101
-msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
-
-#: js/google.js:36 js/google.js:93
-msgid "Error configuring Google Drive storage"
-msgstr ""
-
-#: lib/config.php:431
-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
-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
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
-#: templates/settings.php:3
-msgid "External Storage"
-msgstr ""
-
-#: templates/settings.php:9 templates/settings.php:28
-msgid "Folder name"
-msgstr ""
-
-#: templates/settings.php:10
-msgid "External storage"
-msgstr ""
-
-#: templates/settings.php:11
-msgid "Configuration"
-msgstr ""
-
-#: templates/settings.php:12
-msgid "Options"
-msgstr ""
-
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Add storage"
-msgstr ""
-
-#: templates/settings.php:90
-msgid "None set"
-msgstr ""
-
-#: templates/settings.php:91
-msgid "All Users"
-msgstr ""
-
-#: templates/settings.php:92
-msgid "Groups"
-msgstr ""
-
-#: templates/settings.php:100
-msgid "Users"
-msgstr ""
-
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
-msgid "Delete"
-msgstr ""
-
-#: templates/settings.php:129
-msgid "Enable User External Storage"
-msgstr ""
-
-#: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr ""
-
-#: templates/settings.php:141
-msgid "SSL root certificates"
-msgstr ""
-
-#: templates/settings.php:159
-msgid "Import Root Certificate"
-msgstr ""
diff --git a/l10n/pl_PL/files_sharing.po b/l10n/pl_PL/files_sharing.po
deleted file mode 100644
index c8bd08a2eae..00000000000
--- a/l10n/pl_PL/files_sharing.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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"
-
-#: templates/authenticate.php:4
-msgid "Password"
-msgstr ""
-
-#: templates/authenticate.php:6
-msgid "Submit"
-msgstr ""
-
-#: templates/public.php:10
-#, php-format
-msgid "%s shared the folder %s with you"
-msgstr ""
-
-#: templates/public.php:13
-#, php-format
-msgid "%s shared the file %s with you"
-msgstr ""
-
-#: templates/public.php:19 templates/public.php:43
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:40
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po
deleted file mode 100644
index e6ecf010e77..00000000000
--- a/l10n/pl_PL/files_trashbin.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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
-#, php-format
-msgid "Couldn't delete %s permanently"
-msgstr ""
-
-#: ajax/undelete.php:42
-#, php-format
-msgid "Couldn't restore %s"
-msgstr ""
-
-#: js/trash.js:7 js/trash.js:96
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:34
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:121
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:174 templates/index.php:17
-msgid "Name"
-msgstr ""
-
-#: js/trash.js:175 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:196
-msgid "{count} files"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
-
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30 templates/index.php:31
-msgid "Delete"
-msgstr ""
-
-#: templates/part.breadcrumb.php:9
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
deleted file mode 100644
index d6ce265c2af..00000000000
--- a/l10n/pl_PL/files_versions.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ajax/rollbackVersion.php:15
-#, php-format
-msgid "Could not revert: %s"
-msgstr ""
-
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr ""
-
-#: history.php:69
-msgid "No old versions available"
-msgstr ""
-
-#: history.php:74
-msgid "No path specified"
-msgstr ""
-
-#: js/versions.js:6
-msgid "Versions"
-msgstr ""
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
deleted file mode 100644
index e91de0bce1e..00000000000
--- a/l10n/pl_PL/lib.po
+++ /dev/null
@@ -1,245 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-04 02:29+0200\n"
-"PO-Revision-Date: 2013-06-03 00:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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"
-
-#: app.php:357
-msgid "Help"
-msgstr ""
-
-#: app.php:370
-msgid "Personal"
-msgstr ""
-
-#: app.php:381
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: app.php:393
-msgid "Users"
-msgstr ""
-
-#: app.php:406
-msgid "Apps"
-msgstr ""
-
-#: app.php:414
-msgid "Admin"
-msgstr ""
-
-#: files.php:210
-msgid "ZIP download is turned off."
-msgstr ""
-
-#: files.php:211
-msgid "Files need to be downloaded one by one."
-msgstr ""
-
-#: files.php:212 files.php:245
-msgid "Back to Files"
-msgstr ""
-
-#: files.php:242
-msgid "Selected files too large to generate zip file."
-msgstr ""
-
-#: helper.php:236
-msgid "couldn't be determined"
-msgstr ""
-
-#: json.php:28
-msgid "Application is not enabled"
-msgstr ""
-
-#: json.php:39 json.php:62 json.php:73
-msgid "Authentication error"
-msgstr ""
-
-#: json.php:51
-msgid "Token expired. Please reload page."
-msgstr ""
-
-#: search/provider/file.php:17 search/provider/file.php:35
-msgid "Files"
-msgstr ""
-
-#: search/provider/file.php:26 search/provider/file.php:33
-msgid "Text"
-msgstr ""
-
-#: search/provider/file.php:29
-msgid "Images"
-msgstr ""
-
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
-#, php-format
-msgid "%s enter the database username."
-msgstr ""
-
-#: setup.php:58
-#, php-format
-msgid "%s enter the database name."
-msgstr ""
-
-#: setup.php:61
-#, php-format
-msgid "%s you may not use dots in the database name"
-msgstr ""
-
-#: setup.php:64
-#, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
-msgstr ""
-
-#: setup.php:133 setup.php:238
-msgid "You need to enter either an existing account or the administrator."
-msgstr ""
-
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
-msgid "MySQL username and/or password not valid"
-msgstr ""
-
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
-#, php-format
-msgid "DB Error: \"%s\""
-msgstr ""
-
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
-#, php-format
-msgid "Offending command was: \"%s\""
-msgstr ""
-
-#: setup.php:308
-#, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
-
-#: setup.php:309
-msgid "Drop this user from MySQL"
-msgstr ""
-
-#: setup.php:314
-#, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
-
-#: setup.php:315
-msgid "Drop this user from MySQL."
-msgstr ""
-
-#: setup.php:466 setup.php:533
-msgid "Oracle username and/or password not valid"
-msgstr ""
-
-#: setup.php:592 setup.php:624
-#, php-format
-msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
-
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
-
-#: setup.php:867
-msgid ""
-"Your web server is not yet properly setup to allow files synchronization "
-"because the WebDAV interface seems to be broken."
-msgstr ""
-
-#: setup.php:868
-#, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
-
-#: template.php:113
-msgid "seconds ago"
-msgstr ""
-
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
-msgid "today"
-msgstr ""
-
-#: template.php:119
-msgid "yesterday"
-msgstr ""
-
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
-
-#: template.php:121
-msgid "last month"
-msgstr ""
-
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template.php:123
-msgid "last year"
-msgstr ""
-
-#: template.php:124
-msgid "years ago"
-msgstr ""
-
-#: vcategories.php:188 vcategories.php:249
-#, php-format
-msgid "Could not find category \"%s\""
-msgstr ""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
deleted file mode 100644
index 68a0e23721f..00000000000
--- a/l10n/pl_PL/settings.po
+++ /dev/null
@@ -1,496 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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/apps/ocs.php:20
-msgid "Unable to load list from App Store"
-msgstr ""
-
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
-msgid "Authentication error"
-msgstr ""
-
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
-msgid "Unable to change display name"
-msgstr ""
-
-#: ajax/creategroup.php:10
-msgid "Group already exists"
-msgstr ""
-
-#: ajax/creategroup.php:19
-msgid "Unable to add group"
-msgstr ""
-
-#: ajax/enableapp.php:11
-msgid "Could not enable app. "
-msgstr ""
-
-#: ajax/lostpassword.php:12
-msgid "Email saved"
-msgstr ""
-
-#: ajax/lostpassword.php:14
-msgid "Invalid email"
-msgstr ""
-
-#: ajax/removegroup.php:13
-msgid "Unable to delete group"
-msgstr ""
-
-#: ajax/removeuser.php:24
-msgid "Unable to delete user"
-msgstr ""
-
-#: ajax/setlanguage.php:15
-msgid "Language changed"
-msgstr ""
-
-#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
-msgid "Invalid request"
-msgstr ""
-
-#: ajax/togglegroups.php:12
-msgid "Admins can't remove themself from the admin group"
-msgstr ""
-
-#: ajax/togglegroups.php:30
-#, php-format
-msgid "Unable to add user to group %s"
-msgstr ""
-
-#: ajax/togglegroups.php:36
-#, php-format
-msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: ajax/updateapp.php:14
-msgid "Couldn't update app."
-msgstr ""
-
-#: js/apps.js:30
-msgid "Update to {appversion}"
-msgstr ""
-
-#: js/apps.js:36 js/apps.js:76
-msgid "Disable"
-msgstr ""
-
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
-msgid "Enable"
-msgstr ""
-
-#: js/apps.js:55
-msgid "Please wait...."
-msgstr ""
-
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:90
-msgid "Updating...."
-msgstr ""
-
-#: js/apps.js:93
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:96
-msgid "Updated"
-msgstr ""
-
-#: js/personal.js:118
-msgid "Saving..."
-msgstr ""
-
-#: js/users.js:47
-msgid "deleted"
-msgstr ""
-
-#: js/users.js:47
-msgid "undo"
-msgstr ""
-
-#: js/users.js:79
-msgid "Unable to remove user"
-msgstr ""
-
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
-msgid "Groups"
-msgstr ""
-
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
-msgid "Group Admin"
-msgstr ""
-
-#: js/users.js:115 templates/users.php:160
-msgid "Delete"
-msgstr ""
-
-#: js/users.js:269
-msgid "add group"
-msgstr ""
-
-#: js/users.js:428
-msgid "A valid username must be provided"
-msgstr ""
-
-#: js/users.js:429 js/users.js:435 js/users.js:450
-msgid "Error creating user"
-msgstr ""
-
-#: js/users.js:434
-msgid "A valid password must be provided"
-msgstr ""
-
-#: personal.php:35 personal.php:36
-msgid "__language_name__"
-msgstr ""
-
-#: templates/admin.php:15
-msgid "Security Warning"
-msgstr ""
-
-#: templates/admin.php:18
-msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr ""
-
-#: templates/admin.php:29
-msgid "Setup Warning"
-msgstr ""
-
-#: templates/admin.php:32
-msgid ""
-"Your web server is not yet properly setup to allow files synchronization "
-"because the WebDAV interface seems to be broken."
-msgstr ""
-
-#: templates/admin.php:33
-#, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
-
-#: templates/admin.php:44
-msgid "Module 'fileinfo' missing"
-msgstr ""
-
-#: templates/admin.php:47
-msgid ""
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
-"module to get best results with mime-type detection."
-msgstr ""
-
-#: templates/admin.php:58
-msgid "Locale not working"
-msgstr ""
-
-#: templates/admin.php:63
-#, php-format
-msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr ""
-
-#: templates/admin.php:75
-msgid "Internet connection not working"
-msgstr ""
-
-#: templates/admin.php:78
-msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps don´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr ""
-
-#: templates/admin.php:92
-msgid "Cron"
-msgstr ""
-
-#: templates/admin.php:101
-msgid "Execute one task with each page loaded"
-msgstr ""
-
-#: templates/admin.php:111
-msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr ""
-
-#: templates/admin.php:121
-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:128
-msgid "Sharing"
-msgstr ""
-
-#: templates/admin.php:134
-msgid "Enable Share API"
-msgstr ""
-
-#: templates/admin.php:135
-msgid "Allow apps to use the Share API"
-msgstr ""
-
-#: templates/admin.php:142
-msgid "Allow links"
-msgstr ""
-
-#: templates/admin.php:143
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:150
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:151
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:158
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:161
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:168
-msgid "Security"
-msgstr ""
-
-#: templates/admin.php:181
-msgid "Enforce HTTPS"
-msgstr ""
-
-#: templates/admin.php:182
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
-
-#: templates/admin.php:185
-msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr ""
-
-#: templates/admin.php:195
-msgid "Log"
-msgstr ""
-
-#: templates/admin.php:196
-msgid "Log level"
-msgstr ""
-
-#: templates/admin.php:227
-msgid "More"
-msgstr ""
-
-#: templates/admin.php:228
-msgid "Less"
-msgstr ""
-
-#: templates/admin.php:235 templates/personal.php:111
-msgid "Version"
-msgstr ""
-
-#: templates/admin.php:237 templates/personal.php:114
-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:11
-msgid "Add your App"
-msgstr ""
-
-#: templates/apps.php:12
-msgid "More Apps"
-msgstr ""
-
-#: templates/apps.php:28
-msgid "Select an App"
-msgstr ""
-
-#: templates/apps.php:34
-msgid "See application page at apps.owncloud.com"
-msgstr ""
-
-#: templates/apps.php:36
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
-
-#: templates/apps.php:38
-msgid "Update"
-msgstr "Uaktualnienie"
-
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr ""
-
-#: templates/help.php:6
-msgid "Administrator Documentation"
-msgstr ""
-
-#: templates/help.php:9
-msgid "Online Documentation"
-msgstr ""
-
-#: templates/help.php:11
-msgid "Forum"
-msgstr ""
-
-#: templates/help.php:14
-msgid "Bugtracker"
-msgstr ""
-
-#: templates/help.php:17
-msgid "Commercial Support"
-msgstr ""
-
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
-msgid "Get the apps to sync your files"
-msgstr ""
-
-#: templates/personal.php:26
-msgid "Show First Run Wizard again"
-msgstr ""
-
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
-msgid "Password"
-msgstr ""
-
-#: templates/personal.php:38
-msgid "Your password was changed"
-msgstr ""
-
-#: templates/personal.php:39
-msgid "Unable to change your password"
-msgstr ""
-
-#: templates/personal.php:40
-msgid "Current password"
-msgstr ""
-
-#: templates/personal.php:42
-msgid "New password"
-msgstr ""
-
-#: templates/personal.php:44
-msgid "Change password"
-msgstr ""
-
-#: templates/personal.php:56 templates/users.php:81
-msgid "Display Name"
-msgstr ""
-
-#: templates/personal.php:71
-msgid "Email"
-msgstr "Email"
-
-#: templates/personal.php:73
-msgid "Your email address"
-msgstr ""
-
-#: templates/personal.php:74
-msgid "Fill in an email address to enable password recovery"
-msgstr ""
-
-#: templates/personal.php:83 templates/personal.php:84
-msgid "Language"
-msgstr ""
-
-#: templates/personal.php:95
-msgid "Help translate"
-msgstr ""
-
-#: templates/personal.php:100
-msgid "WebDAV"
-msgstr ""
-
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
-
-#: templates/users.php:21 templates/users.php:80
-msgid "Login Name"
-msgstr ""
-
-#: templates/users.php:30
-msgid "Create"
-msgstr ""
-
-#: templates/users.php:34
-msgid "Admin Recovery Password"
-msgstr ""
-
-#: templates/users.php:38
-msgid "Default Storage"
-msgstr ""
-
-#: templates/users.php:44 templates/users.php:138
-msgid "Unlimited"
-msgstr ""
-
-#: templates/users.php:62 templates/users.php:153
-msgid "Other"
-msgstr ""
-
-#: templates/users.php:87
-msgid "Storage"
-msgstr ""
-
-#: templates/users.php:98
-msgid "change display name"
-msgstr ""
-
-#: templates/users.php:102
-msgid "set new password"
-msgstr ""
-
-#: templates/users.php:133
-msgid "Default"
-msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
deleted file mode 100644
index 242252ed0e4..00000000000
--- a/l10n/pl_PL/user_ldap.po
+++ /dev/null
@@ -1,419 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl_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/clearMappings.php:34
-msgid "Failed to clear the mappings."
-msgstr ""
-
-#: ajax/deleteConfiguration.php:34
-msgid "Failed to delete the server configuration"
-msgstr ""
-
-#: ajax/testConfiguration.php:36
-msgid "The configuration is valid and the connection could be established!"
-msgstr ""
-
-#: ajax/testConfiguration.php:39
-msgid ""
-"The configuration is valid, but the Bind failed. Please check the server "
-"settings and credentials."
-msgstr ""
-
-#: ajax/testConfiguration.php:43
-msgid ""
-"The configuration is invalid. Please look in the ownCloud log for further "
-"details."
-msgstr ""
-
-#: js/settings.js:66
-msgid "Deletion failed"
-msgstr ""
-
-#: js/settings.js:82
-msgid "Take over settings from recent server configuration?"
-msgstr ""
-
-#: js/settings.js:83
-msgid "Keep settings?"
-msgstr ""
-
-#: js/settings.js:97
-msgid "Cannot add server configuration"
-msgstr ""
-
-#: js/settings.js:111
-msgid "mappings cleared"
-msgstr ""
-
-#: js/settings.js:112
-msgid "Success"
-msgstr ""
-
-#: js/settings.js:117
-msgid "Error"
-msgstr ""
-
-#: js/settings.js:141
-msgid "Connection test succeeded"
-msgstr ""
-
-#: js/settings.js:146
-msgid "Connection test failed"
-msgstr ""
-
-#: js/settings.js:156
-msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
-
-#: js/settings.js:157
-msgid "Confirm Deletion"
-msgstr ""
-
-#: templates/settings.php:9
-msgid ""
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
-"disable one of them."
-msgstr ""
-
-#: templates/settings.php:12
-msgid ""
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
-"work. Please ask your system administrator to install it."
-msgstr ""
-
-#: templates/settings.php:16
-msgid "Server configuration"
-msgstr ""
-
-#: templates/settings.php:32
-msgid "Add Server Configuration"
-msgstr ""
-
-#: templates/settings.php:37
-msgid "Host"
-msgstr ""
-
-#: templates/settings.php:39
-msgid ""
-"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "Base DN"
-msgstr ""
-
-#: templates/settings.php:41
-msgid "One Base DN per line"
-msgstr ""
-
-#: templates/settings.php:42
-msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
-
-#: templates/settings.php:44
-msgid "User DN"
-msgstr ""
-
-#: templates/settings.php:46
-msgid ""
-"The DN of the client user with which the bind shall be done, e.g. "
-"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
-"empty."
-msgstr ""
-
-#: templates/settings.php:47
-msgid "Password"
-msgstr ""
-
-#: templates/settings.php:50
-msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
-
-#: templates/settings.php:51
-msgid "User Login Filter"
-msgstr ""
-
-#: templates/settings.php:54
-#, php-format
-msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr ""
-
-#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
-msgid "User List Filter"
-msgstr ""
-
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
-
-#: templates/settings.php:61
-msgid "Group Filter"
-msgstr ""
-
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
-
-#: templates/settings.php:69
-msgid "Connection Settings"
-msgstr ""
-
-#: templates/settings.php:71
-msgid "Configuration Active"
-msgstr ""
-
-#: templates/settings.php:71
-msgid "When unchecked, this configuration will be skipped."
-msgstr ""
-
-#: templates/settings.php:72
-msgid "Port"
-msgstr ""
-
-#: templates/settings.php:73
-msgid "Backup (Replica) Host"
-msgstr ""
-
-#: templates/settings.php:73
-msgid ""
-"Give an optional backup host. It must be a replica of the main LDAP/AD "
-"server."
-msgstr ""
-
-#: templates/settings.php:74
-msgid "Backup (Replica) Port"
-msgstr ""
-
-#: templates/settings.php:75
-msgid "Disable Main Server"
-msgstr ""
-
-#: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
-
-#: templates/settings.php:76
-msgid "Use TLS"
-msgstr ""
-
-#: templates/settings.php:76
-msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
-
-#: templates/settings.php:77
-msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Turn off SSL certificate validation."
-msgstr ""
-
-#: templates/settings.php:78
-msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr ""
-
-#: templates/settings.php:79
-msgid "Cache Time-To-Live"
-msgstr ""
-
-#: templates/settings.php:79
-msgid "in seconds. A change empties the cache."
-msgstr ""
-
-#: templates/settings.php:81
-msgid "Directory Settings"
-msgstr ""
-
-#: templates/settings.php:83
-msgid "User Display Name Field"
-msgstr ""
-
-#: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
-
-#: templates/settings.php:84
-msgid "Base User Tree"
-msgstr ""
-
-#: templates/settings.php:84
-msgid "One User Base DN per line"
-msgstr ""
-
-#: templates/settings.php:85
-msgid "User Search Attributes"
-msgstr ""
-
-#: templates/settings.php:85 templates/settings.php:88
-msgid "Optional; one attribute per line"
-msgstr ""
-
-#: templates/settings.php:86
-msgid "Group Display Name Field"
-msgstr ""
-
-#: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
-
-#: templates/settings.php:87
-msgid "Base Group Tree"
-msgstr ""
-
-#: templates/settings.php:87
-msgid "One Group Base DN per line"
-msgstr ""
-
-#: templates/settings.php:88
-msgid "Group Search Attributes"
-msgstr ""
-
-#: templates/settings.php:89
-msgid "Group-Member association"
-msgstr ""
-
-#: templates/settings.php:91
-msgid "Special Attributes"
-msgstr ""
-
-#: templates/settings.php:93
-msgid "Quota Field"
-msgstr ""
-
-#: templates/settings.php:94
-msgid "Quota Default"
-msgstr ""
-
-#: templates/settings.php:94
-msgid "in bytes"
-msgstr ""
-
-#: templates/settings.php:95
-msgid "Email Field"
-msgstr ""
-
-#: templates/settings.php:96
-msgid "User Home Folder Naming Rule"
-msgstr ""
-
-#: templates/settings.php:96
-msgid ""
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
-"attribute."
-msgstr ""
-
-#: templates/settings.php:101
-msgid "Internal Username"
-msgstr ""
-
-#: templates/settings.php:102
-msgid ""
-"By default the internal username will be created from the UUID attribute. It"
-" makes sure that the username is unique and characters do not need to be "
-"converted. The internal username has the restriction that only these "
-"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
-"with their ASCII correspondence or simply omitted. On collisions a number "
-"will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
-
-#: templates/settings.php:103
-msgid "Internal Username Attribute:"
-msgstr ""
-
-#: templates/settings.php:104
-msgid "Override UUID detection"
-msgstr ""
-
-#: templates/settings.php:105
-msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
-"username will be created based on the UUID, if not specified otherwise "
-"above. You can override the setting and pass an attribute of your choice. "
-"You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
-
-#: templates/settings.php:106
-msgid "UUID Attribute:"
-msgstr ""
-
-#: templates/settings.php:107
-msgid "Username-LDAP User Mapping"
-msgstr ""
-
-#: templates/settings.php:108
-msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr ""
-
-#: templates/settings.php:109
-msgid "Clear Username-LDAP User Mapping"
-msgstr ""
-
-#: templates/settings.php:109
-msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
-
-#: templates/settings.php:111
-msgid "Test Configuration"
-msgstr ""
-
-#: templates/settings.php:111
-msgid "Help"
-msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 1fab4b5af5e..a48b9dd777a 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:11+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 10:40+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,36 +19,27 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "A data de vencimento passou."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, 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"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Ativar modo de manutenção"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Desligar o modo de manutenção"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -145,63 +136,63 @@ msgstr "novembro"
 msgid "December"
 msgstr "dezembro"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] " ha %n minuto"
 msgstr[1] "ha %n minutos"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "ha %n hora"
 msgstr[1] "ha %n horas"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "ha %n dia"
 msgstr[1] "ha %n dias"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "último mês"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "ha %n mês"
 msgstr[1] "ha %n meses"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr "Conflito em um arquivo"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Novos Arquivos"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr "Arquivos já existentes"
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Qual arquivo você quer manter?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(todos os selecionados)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} selecionados)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Erro ao carregar arquivo existe modelo"
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "Compartilhar"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
@@ -418,19 +417,19 @@ msgstr "Protegido com senha"
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiração"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiração"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Aviso"
 
@@ -544,6 +543,18 @@ msgstr "Nova senha"
 msgid "Reset password"
 msgstr "Redefinir senha"
 
+#: 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 não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!"
+
+#: setup/controller.php:144
+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"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index c2613ba663e..7134687faec 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +20,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" é um nome de arquivo inválido."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Não é uma fonte válida"
 
-#: ajax/newfile.php:101
+#: 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."
@@ -71,74 +71,74 @@ msgstr "Não é permitido ao servidor abrir URLs, por favor verificar a configur
 msgid "Error while downloading %s to %s"
 msgstr "Erro ao baixar %s para %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Erro ao criar a pasta"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Impossível configurar o diretório de upload"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Token inválido"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi enviado. Erro desconhecido"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Sem erros, o arquivo foi enviado com sucesso"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi parcialmente enviado"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo enviado"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Pasta temporária não encontrada"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Falha no envio. Não foi possível encontrar o arquivo enviado"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 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:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
@@ -159,92 +159,92 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL não pode estar vazia"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Na pasta home 'Shared- Compartilhada' é um nome reservado"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Não foi possível criar o arquivo"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Não foi possível criar a pasta"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Erro ao buscar URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Erro movendo o arquivo"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Erro"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Não foi possível renomear o arquivo"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "Substituído {old_name} por {new_name} "
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "desfazer"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Erro eliminando o arquivo."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n arquivo"
 msgstr[1] "%n arquivos"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} e {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Enviando %n arquivo"
@@ -281,29 +281,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Erro movendo o arquivo"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Erro"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
@@ -311,113 +303,109 @@ msgstr "Modificado"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nome da pasta inválido. Uso de 'Shared' é reservado."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s não pode ser renomeado"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Tratamento de Arquivo"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Tamanho máximo para carregar"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. possível:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Necessário para download de múltiplos arquivos e diretórios."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Habilitar ZIP-download"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 para ilimitado"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Tamanho máximo para arquivo ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Novo arquivo texto"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Arquivo texto"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Pasta"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Do link"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Arquivos apagados"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/pt_BR/files_external.po
index 51cc85df586..0a8a376d6f6 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:20+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 16:50+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -38,91 +38,100 @@ msgstr "Por favor forneça um app key e secret válido do Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar armazenamento do Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Salvo"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Nota:</b>"
+
+#: lib/config.php:602
+msgid " and "
+msgstr "e"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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> 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Armazenamento Externo"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nome da pasta"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Armazenamento Externo"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuração"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opções"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplicável"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Disponível para"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Adicionar Armazenamento"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Nenhum definido"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Nenhum usuário ou grupo"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Todos os Usuários"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Usuários"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Habilitar Armazenamento Externo do Usuário"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Permitir que usuários montem o seguinte armazenamento externo"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificados SSL raíz"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importar Certificado Raíz"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 933f86576a2..a7c133b16a6 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:20+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 16:40+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"
@@ -66,23 +66,23 @@ msgstr "Imagem inválida"
 msgid "web services under your control"
 msgstr "serviços web sob seu controle"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Download ZIP está desligado."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Arquivos precisam ser baixados um de cada vez."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Voltar para Arquivos"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome de usuário e/ou senha MS SQL inválido(s): %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 "Você precisa inserir uma conta existente ou o administrador."
 
@@ -207,9 +207,9 @@ msgstr "MySQL/MariaDB nome de usuário e/ou senha não é válida"
 #: 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 no BD: \"%s\""
@@ -218,9 +218,9 @@ msgstr "Erro no 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 "Comando ofensivo era: \"%s\""
@@ -256,7 +256,7 @@ msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %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 usuário e/ou senha PostgreSQL inválido(s)"
 
@@ -268,19 +268,19 @@ msgstr "Defina um nome de usuário de administrador."
 msgid "Set an admin password."
 msgstr "Defina uma senha de administrador."
 
-#: private/setup.php:198
+#: 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 "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s compartilhou »%s« com você"
@@ -337,3 +337,21 @@ msgstr "último ano"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "anos atrás"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Somente os seguintes caracteres são permitidos no nome do usuário: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Forneça um nome de usuário válido"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Forneça uma senha válida"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Este nome de usuário já está sendo usado"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 1d0ad869d15..c94e167dc92 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 14:01+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "E-mail enviado"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Modo enviar"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
@@ -66,7 +66,7 @@ msgid "Unable to load list from App Store"
 msgstr "Não foi possível carregar lista da 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 "Erro de autenticação"
 
@@ -128,32 +128,32 @@ msgstr "Não foi possível remover usuário do grupo %s"
 msgid "Couldn't update app."
 msgstr "Não foi possível atualizar a app."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Senha errada"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Nenhum usuário fornecido"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente."
 
-#: 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 "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso...."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Impossível modificar senha"
 
@@ -205,7 +205,7 @@ msgstr "Erro ao atualizar aplicativo"
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Atualizar"
 
@@ -213,7 +213,7 @@ msgstr "Atualizar"
 msgid "Updated"
 msgstr "Atualizado"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Selecione uma imagem para o perfil"
 
@@ -237,7 +237,7 @@ msgstr "Boa senha"
 msgid "Strong password"
 msgstr "Senha forte"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo."
 
@@ -286,7 +286,7 @@ msgstr "Forneça uma senha válida"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Aviso: O diretório home para o usuário \"{user}\" já existe"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Português (Brasil)"
 
@@ -429,157 +429,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartilhamento"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Habilitar API de Compartilhamento"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que aplicativos usem a API de Compartilhamento"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir envio público"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir recompartilhamento"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir que usuários compartilhem com qualquer um"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificação por email"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Servidor de Email"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Isto é usado para o envio de notificações."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Do Endereço"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Autenticação é requerida"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Nome do Usuário SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Senha SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Configurações de e-mail de teste"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Enviar email"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nível de registro"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +613,23 @@ msgstr "Adicione seu Aplicativo"
 msgid "More Apps"
 msgstr "Mais Apps"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Selecione um Aplicativo"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentação:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver página do aplicativo em apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Consulte o site aplicação"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
@@ -650,108 +666,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Senha"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Sua senha foi alterada"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Não é possivel alterar a sua senha"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Senha atual"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nova senha"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Seu endereço de e-mail"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Imagem para o perfil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Enviar nova foto"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Selecinar uma nova dos Arquivos"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Remover imagem"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Seu avatar é fornecido por sua conta original."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Escolha como imagem para o perfil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Senha de login"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Decripti todos os Arquivos"
 
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 7835f9b48a5..a50f34a3474 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:11+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 10:51+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"
@@ -421,41 +421,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Bloco de paginação"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como usuário ou grupo de enumeração. (Defini-lo 0 desativa paginada pesquisas LDAP nessas situações.)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atributos Especiais"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Campo de Cota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Cota Padrão"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Campo de Email"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Regra para Nome da Pasta Pessoal do Usuário"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nome de usuário interno"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atributo Interno de Nome de Usuário:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Substituir detecção UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID Atributos para Usuários:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID Atributos para Grupos:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Usuário-LDAP Mapeamento de Usuário"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 62c26f7503a..1d50e0c83c6 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -24,36 +24,27 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Não conseguiu enviar correio aos seguintes utilizadores: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Activado o modo de manutenção"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Desactivado o modo de manutenção"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -150,63 +141,63 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Dezembro"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "A guardar..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto atrás"
 msgstr[1] "%n minutos atrás"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hora atrás"
 msgstr[1] "%n horas atrás"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dia atrás"
 msgstr[1] "%n dias atrás"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:1002
+#: js/js.js:1131
 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:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -245,32 +236,40 @@ msgid "One file conflict"
 msgstr "Um conflito no ficheiro"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Ficheiros Novos"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Quais os ficheiros que pretende manter?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(todos seleccionados)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Erro ao carregar o modelo de existências do ficheiro"
 
@@ -303,11 +302,11 @@ msgid "Share"
 msgstr "Partilhar"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
@@ -423,19 +422,19 @@ msgstr "Protegido com palavra-passe"
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiração"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiração"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Aviso"
 
@@ -549,6 +548,18 @@ msgstr "Nova palavra-chave"
 msgid "Reset password"
 msgstr "Repor password"
 
+#: 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 "Pessoal"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index caa2d759d97..c6587d1998a 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -21,48 +21,48 @@ 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 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Não é uma fonte válida"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -72,74 +72,74 @@ msgstr "O servidor não consegue abrir URLs, por favor verifique a configuraçã
 msgid "Error while downloading %s to %s"
 msgstr "Erro ao transferir %s para %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 msgid "Error when creating the file"
 msgstr "Erro ao criar o ficheiro"
 
-#: 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Erro ao criar a pasta"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Não foi possível criar o diretório de upload"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Token inválido"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Não ocorreram erros, o ficheiro foi submetido com sucesso"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nenhum ficheiro foi submetido"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Está a faltar a pasta temporária"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Falhou a escrita no disco"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Não há espaço suficiente em disco"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Falhou o envio. Não conseguiu encontrar o ficheiro enviado"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 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:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Directório Inválido"
 
@@ -160,92 +160,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL não pode estar vazio"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Na pasta pessoal \"Partilhado\" é um nome de ficheiro reservado"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Não pôde criar ficheiro"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Não pôde criar pasta"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Erro ao obter URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Erro ao mover o ficheiro"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Erro"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Erro ao apagar o ficheiro."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
 msgstr[1] "%n ficheiros"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} e {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "A carregar %n ficheiro"
@@ -282,29 +282,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Erro ao mover o ficheiro"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Erro"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificado"
 
@@ -312,113 +304,109 @@ msgstr "Modificado"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nome de pasta inválido. Utilização de \"Partilhado\" está reservada."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s não pode ser renomeada"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Carregar"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Manuseamento de ficheiros"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Tamanho máximo de envio"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. possivel: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Necessário para multi download de ficheiros e pastas"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Permitir descarregar em ficheiro ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 é ilimitado"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Tamanho máximo para ficheiros ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Novo ficheiro de texto"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nova Pasta"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Pasta"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Da ligação"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "Você não tem permissão para enviar ou criar ficheiros aqui"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/pt_PT/files_external.po
index f89145893cb..d46f758eefe 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -4,14 +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: 2014-03-16 03:12-0400\n"
-"PO-Revision-Date: 2014-03-15 16:30+0000\n"
-"Last-Translator: jmruas <jmruas@gmail.com>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -39,91 +40,100 @@ msgstr "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas."
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar o armazenamento do Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Guardado"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Armazenamento Externo"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Nome da pasta"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Armazenamento Externo"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuração"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opções"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplicável"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Adicionar armazenamento"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Não definido"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Todos os utilizadores"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Utilizadores"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Activar Armazenamento Externo para o Utilizador"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Permitir que os utilizadores montem o seguinte armazenamento externo"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificados SSL de raiz"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importar Certificado Root"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index d042b9424cf..e8a0c4927da 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -68,23 +68,23 @@ msgstr "Imagem inválida"
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Descarregamento em ZIP está desligado."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros precisam de ser descarregados um por um."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Voltar a Ficheiros"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -270,19 +270,19 @@ msgstr "Definir um nome de utilizador de administrador"
 msgid "Set an admin password."
 msgstr "Definiar uma password de administrador"
 
-#: private/setup.php:198
+#: 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 "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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor verifique <a href='%s'>installation guides</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s partilhado »%s« contigo"
@@ -339,3 +339,21 @@ msgstr "ano passado"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "anos atrás"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Um nome de utilizador válido deve ser fornecido"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Uma password válida deve ser fornecida"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index ee073474d11..ea6ff1bc02c 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -54,15 +54,15 @@ msgstr "E-mail enviado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Modo de envio"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgid "Unable to load list from App Store"
 msgstr "Incapaz de carregar a lista da 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 "Erro na autenticação"
 
@@ -133,32 +133,32 @@ msgstr "Impossível apagar utilizador do grupo %s"
 msgid "Couldn't update app."
 msgstr "Não foi possível actualizar a aplicação."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Password errada"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Nenhum utilizador especificado."
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente 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 "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Não foi possível alterar a sua password"
 
@@ -210,7 +210,7 @@ msgstr "Erro enquanto actualizava a aplicação"
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Actualizar"
 
@@ -218,31 +218,31 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Seleccione uma fotografia de perfil"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:316
+#: js/personal.js:313
 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."
 
@@ -291,7 +291,7 @@ msgstr "Uma password válida deve ser fornecida"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Atenção: a pasta pessoal do utilizador \"{user}\" já existe"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -434,157 +434,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Partilha"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activar a API de partilha"
 
-#: templates/admin.php:195
+#: 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:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir Envios Públicos"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir repartilha"
 
-#: templates/admin.php:221
+#: 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:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os utilizadores partilhem com todos"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificação por email"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Servidor de email"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Isto é utilizado para enviar notificações"
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Do endereço"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Autenticação necessária"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Porto"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Nome de utilizador SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Password SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Testar configurações de email"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Enviar email"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registo"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nível do registo"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -602,23 +618,23 @@ msgstr "Adicione a sua aplicação"
 msgid "More Apps"
 msgstr "Mais Aplicações"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Selecione uma aplicação"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Documentação:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver a página da aplicação em apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Ver site da aplicação"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
@@ -655,108 +671,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "A sua palavra-passe foi alterada"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Não foi possivel alterar a sua palavra-chave"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Palavra-chave actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nova palavra-chave"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "O seu endereço de email"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Foto do perfil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Carregar novo"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Seleccionar novo a partir dos ficheiros"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Remover imagem"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "O seu avatar é fornecido pela sua conta original."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Escolha uma fotografia de perfil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Password de entrada"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Desencriptar todos os ficheiros"
 
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index d22b1d69435..24be2d824ab 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -423,41 +423,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Quota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Quota padrão"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Campo de email"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Regra da pasta inicial do utilizador"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Nome de utilizador interno"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -473,15 +484,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atributo do nome de utilizador interno"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Passar a detecção do UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Atributo UUID para utilizadores:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo UUID para grupos:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Mapeamento do utilizador LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -518,10 +529,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar mapeamento do utilizador-LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 0afbca84677..720dcd043e3 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/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-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 15:59+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -21,36 +21,27 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 "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 ""
@@ -147,67 +138,67 @@ msgstr "Noiembrie"
 msgid "December"
 msgstr "Decembrie"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Setări"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Se salvează..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:996
+#: js/js.js:1125
 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:997
+#: js/js.js:1126
 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:998
+#: js/js.js:1127
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:1000
+#: js/js.js:1129
 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:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -247,32 +238,40 @@ msgid "One file conflict"
 msgstr "Un conflict de fișier"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Ce fișiere vrei să păstrezi?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Anulare"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Continuă"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -305,11 +304,11 @@ msgid "Share"
 msgstr "Partajează"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Eroare"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
@@ -425,19 +424,19 @@ msgstr "Protejare cu parolă"
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Se expediază..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Atenție"
 
@@ -551,6 +550,18 @@ msgstr "Noua parolă"
 msgid "Reset password"
 msgstr "Resetează parola"
 
+#: 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 "Personal"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 94933947eec..6dbdb8198fa 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 16:03+0000\n"
-"Last-Translator: andreiacob <andrei.iacob@y7mail.com>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -24,48 +24,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/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 se poate muta %s"
 
-#: ajax/newfile.php:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -73,76 +73,76 @@ msgstr ""
 #: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
-msgstr ""
+msgstr "Eroare la descarcarea %s in %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 msgid "Error when creating the file"
 msgstr "Eroare la crearea fisierului"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
-msgstr ""
+msgstr "Numele folderului nu poate fi liber."
 
-#: ajax/newfolder.php:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Eroare la crearea folderului"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Imposibil de a seta directorul pentru incărcare."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Jeton Invalid"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Niciun fișier nu a fost încărcat. Eroare necunoscută"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 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:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fișierul a fost încărcat doar parțial"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nu a fost încărcat niciun fișier"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Lipsește un dosar temporar"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Eroare la scrierea pe disc"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nu este disponibil suficient spațiu"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 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:166
+#: ajax/upload.php:169
 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:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Dosar nevalid."
 
@@ -163,94 +163,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL nu poate fi gol"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} există deja"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Nu s-a putut crea fisierul"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Nu s-a putut crea folderul"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Partajează"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Șterge permanent"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Redenumește"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Eroare la mutarea fișierului"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Eroare"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n director"
 msgstr[1] "%n directoare"
 msgstr[2] "%n directoare"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 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:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} și {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Se încarcă %n fișier."
@@ -288,29 +288,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Se pregătește descărcarea. Aceasta poate dura ceva timp dacă fișierele sunt mari."
 
-#: js/files.js:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Eroare la mutarea fișierului"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Eroare"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Mărime"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Modificat"
 
@@ -318,113 +310,109 @@ msgstr "Modificat"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nu a putut fi redenumit"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Încărcă"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Manipulare fișiere"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Dimensiune maximă admisă la încărcare"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. posibil:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Necesar pentru descărcarea mai multor fișiere și a dosarelor."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Permite descărcarea ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 este nelimitat"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Dimensiunea maximă de intrare pentru fișierele ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Salvează"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nou"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Fișier text"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Dosar"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "De la adresa"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Fișiere șterse"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "Nu aveti permisiunea de a incarca sau crea fisiere aici"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. Încarcă ceva!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Fișierele sunt scanate, te rog așteaptă."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "În curs de scanare"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Actualizare fișiere de sistem cache..."
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 138c6c5ba87..137e05d9291 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/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: 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"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Prezintă te rog o cheie de Dropbox validă și parola"
 msgid "Error configuring Google Drive storage"
 msgstr "Eroare la configurarea mediului de stocare Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Salvat"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Atentie:</b> Suportul Curl nu este pornit / instalat in configuratia PHP! Montarea ownCloud / WebDAV / GoogleDrive nu este posibila! Intrebati administratorul sistemului despre aceasta problema!"
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Stocare externă"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Denumire director"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Stocare externă"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configurație"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opțiuni"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplicabil"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Adauga stocare"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Niciunul"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Toți utilizatorii"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Utilizatori"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Permite stocare externă pentru utilizatori"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Permite utilizatorilor să monteze următoarea unitate de stocare"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Certificate SSL root"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importă certificat root"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index f53e445c723..6beeb527615 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -66,23 +66,23 @@ msgstr "Imagine invalidă"
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Descărcarea ZIP este dezactivată."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Fișierele trebuie descărcate unul câte unul."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Înapoi la fișiere"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -193,8 +193,8 @@ 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 ""
 
@@ -207,9 +207,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
@@ -218,9 +218,9 @@ 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 ""
@@ -256,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 ""
 
@@ -268,19 +268,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s Partajat »%s« cu tine de"
@@ -341,3 +341,21 @@ msgstr "ultimul an"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "ani în urmă"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Trebuie să furnizaţi un nume de utilizator valid"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Trebuie să furnizaţi o parolă validă"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index de7d448e8d6..7358fd44fc6 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -49,15 +49,15 @@ msgstr "Mesajul a fost expediat"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Încriptare"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -66,7 +66,7 @@ msgid "Unable to load list from App Store"
 msgstr "Imposibil de actualizat lista din  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 "Eroare la autentificare"
 
@@ -128,32 +128,32 @@ msgstr "Nu s-a putut elimina utilizatorul din grupul %s"
 msgid "Couldn't update app."
 msgstr "Aplicaţia nu s-a putut actualiza."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Parolă greșită"
 
-#: 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 "Imposibil de schimbat parola"
 
@@ -205,7 +205,7 @@ msgstr "Eroare în timpul actualizării aplicaţiei"
 msgid "Error"
 msgstr "Eroare"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Actualizare"
 
@@ -213,7 +213,7 @@ msgstr "Actualizare"
 msgid "Updated"
 msgstr "Actualizat"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -237,7 +237,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -286,7 +286,7 @@ msgstr "Trebuie să furnizaţi o parolă validă"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "_language_name_"
 
@@ -334,18 +334,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Avertisment de securitate"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -354,68 +354,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Atenţie la implementare"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "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:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulul \"Fileinfo\" lipsește"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Localizarea nu funcționează"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Conexiunea la internet nu funcționează"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -424,162 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Partajare"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activare API partajare"
 
-#: templates/admin.php:191
+#: 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:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Pemite legături"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permite încărcări publice"
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permite repartajarea"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permite utilizatorilor să partajeze cu oricine"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Securitate"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adresa server-ului"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Portul"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel jurnal"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mai puțin"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +613,23 @@ msgstr "Adaugă aplicația ta"
 msgid "More Apps"
 msgstr "Mai multe aplicații"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Selectează o aplicație"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>"
 
@@ -650,108 +666,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Parola a fost modificată"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Imposibil de-ați schimbat parola"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Parola curentă"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Noua parolă"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Imagine de profil"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Înlătură imagine"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Anulare"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Alege drept imagine de profil"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index b81ac785574..8d75f9248c8 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "în octeți"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index a3bcdfa87ad..b201c601b06 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -13,6 +13,7 @@
 # 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,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -33,36 +34,27 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Дата истечения срока действия в прошлом."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Невозможно отправить письмо следующим пользователям: %s"
 
-#: 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 "... %d%% завершено ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Не указано изображение или файл"
@@ -159,67 +151,67 @@ msgstr "Ноябрь"
 msgid "December"
 msgstr "Декабрь"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Сохранение..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n минуту назад"
 msgstr[1] "%n минуты назад"
 msgstr[2] "%n минут назад"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n час назад"
 msgstr[1] "%n часа назад"
 msgstr[2] "%n часов назад"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n день назад"
 msgstr[1] "%n дня назад"
 msgstr[2] "%n дней назад"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n месяц назад"
 msgstr[1] "%n месяца назад"
 msgstr[2] "%n месяцев назад"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "несколько месяцев назад"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "несколько лет назад"
 
@@ -259,54 +251,62 @@ msgid "One file conflict"
 msgstr "Один конфликт в файлах"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Новые файлы"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Какие файлы вы хотите сохранить?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "При выборе обоих версий,  к названию копируемого файла будет добавлена цифра"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Отменить"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Продолжить"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(выбраны все)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} выбрано)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Ошибка при загрузке шаблона существующего файла"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Очень слабый пароль"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Слабый пароль"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Так себе пароль"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Хороший пароль"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Устойчивый к взлому пароль"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -317,11 +317,11 @@ msgid "Share"
 msgstr "Открыть доступ"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Ошибка при открытии доступа"
 
@@ -437,19 +437,19 @@ msgstr "Защищено паролем"
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отмене срока доступа"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Ошибка при установке срока доступа"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Отправляется ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Письмо отправлено"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -505,7 +505,7 @@ msgstr "%s сброс пароля"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Произошла ошибка при отправке сообщения электронной почты, пожалуйста, свяжитесь с Вашим администратором."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -563,6 +563,18 @@ 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 "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!"
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Личное"
@@ -683,7 +695,7 @@ msgstr "Создать <strong>учётную запись администра�
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Система хранения данных & база данных"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -784,7 +796,7 @@ msgstr "Альтернативные имена пользователя"
 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 ""
+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 92d1019bc16..41b0e3084ba 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -8,6 +8,7 @@
 # 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
@@ -18,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -28,48 +29,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"
 
-#: 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Имя файла не может быть пустым."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" это не правильное имя файла."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Неправильное имя: символы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Целевой каталог был перемещен или удален."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Неправильный источник"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Сервер не позволяет открывать URL-адреса, пожалуйста, проверьте настройки сервера"
@@ -79,74 +80,74 @@ msgstr "Сервер не позволяет открывать URL-адреса
 msgid "Error while downloading %s to %s"
 msgstr "Ошибка при скачивании %s в %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Ошибка создания каталога"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Не удалось установить каталог загрузки."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Недопустимый маркер"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл загружен успешно."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл загружен лишь частично"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ни одного файла загружено не было"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Отсутствует временный каталог"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Ошибка записи на диск"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Недостаточно доступного места в хранилище"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Загрузка не удалась. Невозможно найти загружаемый файл"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Загрузка не удалась. Невозможно получить информацию о файле"
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Неверный каталог."
 
@@ -160,101 +161,101 @@ msgstr "Невозможно загрузить {filename}, так как это
 
 #: js/file-upload.js:258
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Полный размер файла {size1} превышает лимит по загрузке {size2}"
 
 #: js/file-upload.js:268
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}"
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Не удалось получить ответ от сервера."
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "Ссылка не может быть пустой."
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "'Shared' - это зарезервированное имя файла в домашнем каталоге"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Не удалось создать файл"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Не удалось создать каталог"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Ошибка получения URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Открыть доступ"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Удалить окончательно"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Ошибка при перемещении файла"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Не удалось переименовать файл"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "заменено {new_name} на {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "отмена"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Ошибка при удалении файла."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n каталог"
 msgstr[1] "%n каталога"
 msgstr[2] "%n каталогов"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
 msgstr[1] "%n файла"
 msgstr[2] "%n файлов"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} и {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Закачка %n файла"
@@ -263,7 +264,7 @@ msgstr[2] "Закачка %n файлов"
 
 #: js/files.js:96
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" это не правильное имя файла."
 
 #: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
@@ -292,29 +293,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их."
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Дата изменения"
 
@@ -322,113 +315,109 @@ msgstr "Дата изменения"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не может быть переименован"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Загрузка"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Управление файлами"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Максимальный размер загружаемого файла"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "макс. возможно: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Требуется для скачивания нескольких файлов и папок"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Включить скачивание в виде архивов ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 - без ограничений"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Максимальный исходный размер для ZIP файлов"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Новый"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Новый текстовый файл"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Текстовый файл"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Новый каталог"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Каталог"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Объект по ссылке"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Удалённые файлы"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Отменить загрузку"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "У вас нет прав для загрузки или создания файлов здесь."
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Файл слишком велик"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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 07f348b79de..d0f028c8df8 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: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-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"
@@ -108,7 +109,7 @@ msgstr "Начато начальное шифрование... Это може�
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 6af3711cc64..d3611c51ccc 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -3,12 +3,13 @@
 # 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: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 05:55+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"
@@ -37,91 +38,100 @@ msgstr "Пожалуйста, предоставьте действующий к
 msgid "Error configuring Google Drive storage"
 msgstr "Ошибка при настройке хранилища Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
+msgstr "Сохранено"
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:624
+#, php-format
 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 невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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 невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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> Поддержка Curl в PHP не включена или не установлена. Подключение ownCloud / WebDAV или GoogleDrive невозможно. Попросите вашего системного администратора установить его."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Внешний носитель"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Имя папки"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Внешний носитель данных"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Опции"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Применимый"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Добавить носитель данных"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Не установлено"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Все пользователи"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Пользователи"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Включить пользовательские внешние носители"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Разрешить пользователям монтировать следующую внешнюю систему хранения данных"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Корневые сертификаты SSL"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index f2f68e4ca15..f59ffd70fa5 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -72,23 +72,23 @@ msgstr "Изображение повреждено"
 msgid "web services under your control"
 msgstr "веб-сервисы под вашим управлением"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP-скачивание отключено."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -199,8 +199,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Имя пользователя и/или пароль MS SQL не подходит: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вы должны войти или в существующий аккаунт или под администратором."
 
@@ -213,9 +213,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Ошибка БД: \"%s\""
@@ -224,9 +224,9 @@ msgstr "Ошибка БД: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Вызываемая команда была: \"%s\""
@@ -262,7 +262,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"
 
@@ -274,19 +274,19 @@ msgstr "Установить имя пользователя для admin."
 msgid "Set an admin password."
 msgstr "становит пароль для admin."
 
-#: private/setup.php:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s поделился »%s« с вами"
@@ -347,3 +347,21 @@ msgstr "в прошлом году"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "несколько лет назад"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Укажите правильное имя пользователя"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Укажите валидный пароль"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 1d3f437adcc..4e3067464e0 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -39,7 +39,7 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Сохранено"
 
 #: admin/controller.php:90
 msgid "test email settings"
@@ -62,15 +62,15 @@ msgstr "Письмо отправлено"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -79,7 +79,7 @@ msgid "Unable to load list from App Store"
 msgstr "Не удалось загрузить список из 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 "Ошибка аутентификации"
 
@@ -141,32 +141,32 @@ 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 "Невозможно изменить пароль"
 
@@ -218,7 +218,7 @@ msgstr "Ошибка при обновлении приложения"
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Обновить"
 
@@ -226,31 +226,31 @@ msgstr "Обновить"
 msgid "Updated"
 msgstr "Обновлено"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Выберите картинку профиля"
 
 #: js/personal.js:274
 msgid "Very weak password"
-msgstr ""
+msgstr "Очень слабый пароль"
 
 #: js/personal.js:275
 msgid "Weak password"
-msgstr ""
+msgstr "Слабый пароль"
 
 #: js/personal.js:276
 msgid "So-so password"
-msgstr ""
+msgstr "Так себе пароль"
 
 #: js/personal.js:277
 msgid "Good password"
-msgstr ""
+msgstr "Хороший пароль"
 
 #: js/personal.js:278
 msgid "Strong password"
-msgstr ""
+msgstr "Устойчивый к взлому пароль"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время."
 
@@ -299,7 +299,7 @@ msgstr "Укажите валидный пароль"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Предупреждение: домашняя папка пользователя \"{user}\" уже существует"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Русский "
 
@@ -347,18 +347,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Предупреждение безопасности"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "Вы обращаетесь к %s используя HTTP. Мы настоятельно рекомендуем вам настроить сервер на использование HTTPS."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -367,68 +367,68 @@ msgid ""
 "root."
 msgstr "Похоже, что папка с Вашими данными и Ваши файлы доступны из интернета. Файл .htaccess не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера."
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Предупреждение установки"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Модуль 'fileinfo' отсутствует"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Ваша версия PHP устарела"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "Ваша версия PHP устарела. Мы настоятельно рекомендуем  обновиться до 5.3.8 или новее,  так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом."
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Локализация не работает"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Невозможно установить системную локаль, поддерживающую UTF-8"
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Это значит, что могут быть проблемы с некоторыми символами в именах файлов."
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s."
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Интернет-соединение не работает"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -437,162 +437,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности."
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Планировщик задач по расписанию"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Общий доступ"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Включить API общего доступа"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Позволить приложениям использовать API общего доступа"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Разрешить ссылки"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Разрешить открытые загрузки"
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Разрешить пользователям позволять другим загружать в их открытые папки"
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Разрешить переоткрытие общего доступа"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Разрешить пользователя делать общий доступ любому"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Разрешить уведомление по почте"
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Разрешить пользователю оповещать почтой о расшаренных файлах"
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Безопасность"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Принудить к HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Принудить клиентов подключаться к %s через шифрованное соединение."
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Адрес сервера"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Полномочия"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Уровень детализации журнала"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Больше"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Меньше"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -610,23 +626,23 @@ msgstr "Добавить приложение"
 msgid "More Apps"
 msgstr "Больше приложений"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Выберите приложение"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Смотрите дополнения на apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>"
 
@@ -663,108 +679,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Ваш пароль изменён"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Невозможно сменить пароль"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Новый пароль"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Ваш адрес электронной почты"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Фото профиля"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Загрузить новую"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Выберите новый из файлов"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Удалить изображение"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже."
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Будет использован аватар вашей оригинальной учетной записи."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Отменить"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Выберите изображение профиля"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Помочь с переводом"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы"
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Пароль входа"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Снять шифрование со всех файлов"
 
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index d6ca8bbef1c..feb3e9d1eb9 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -431,41 +431,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Специальные атрибуты"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Поле квоты"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Квота по умолчанию"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Поле адреса электронной почты"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Правило именования домашней папки пользователя"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD."
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Внутреннее имя пользователя"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -481,15 +492,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Атрибут для внутреннего имени:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Переопределить нахождение UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -500,19 +511,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP."
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID-атрибуты для пользователей:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-атрибуты для групп:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Соответствия Имя-Пользователь LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -526,10 +537,10 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется различающееся имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если различающееся имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP-подключения! Ни в коем случае не рекомендуется сбрасывать привязки, если система уже находится в эксплуатации, только на этапе тестирования."
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Очистить соответствия Имя-Пользователь LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Очистить соответствия Группа-Группа LDAP"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 984cdcbe1e9..2379dad798a 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr "නොවැම්බර්"
 msgid "December"
 msgstr "දෙසැම්බර්"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "මාස කීපයකට පෙර"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "එපා"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
 msgid "Error unsetting expiration date"
 msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "අවවාදය"
 
@@ -542,6 +541,18 @@ 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 "පෞද්ගලික"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 5c705613198..80c2555ba9b 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "ගොනුවක් උඩුගත නොවුණි"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "තැටිගත කිරීම අසාර්ථකයි"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "දෝෂයක්"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
-msgstr "නිෂ්ප්‍රභ කරන්න"
+#: js/filelist.js:630
+msgid "Could not rename file"
+msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
@@ -308,113 +300,109 @@ msgstr "වෙනස් කළ"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "උඩුගත කරන්න"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "ගොනු පරිහරණය"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "උඩුගත කිරීමක උපරිම ප්‍රමාණය"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "හැකි උපරිමය:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "බහු-ගොනු හා ෆොල්ඩර බාගත කිරීමට අවශ්‍යයි"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP-බාගත කිරීම් සක්‍රිය කරන්න"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 යනු සීමාවක් නැති බවය"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP ගොනු සඳහා දැමිය හැකි උපරිම විශාලතවය"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "සුරකින්න"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "නව"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "පෙළ ගොනුව"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "ෆෝල්ඩරය"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "යොමුවෙන්"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "උඩුගත කිරීම අත් හරින්න"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "බාන්න"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "උඩුගත කිරීම විශාල වැඩිය"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය"
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 9e8b521ac5c..471f8579648 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "කරුණාකර වලංගු Dropbox යෙදුම් යත�
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "භාහිර ගබඩාව"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "ෆොල්ඩරයේ නම"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "වින්‍යාසය"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "විකල්පයන්"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "අදාළ"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "කිසිවක් නැත"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "සියළු පරිශීලකයන්"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "කණ්ඩායම්"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL මූල සහතිකයන්"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "මූල සහතිකය ආයාත කරන්න"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 8699aa3e99d..5307a86f2fb 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "ගොනු එකින් එක භාගත යුතුයි"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "ගොනු වෙතට නැවත යන්න"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "පෙර අවුරුද්දේ"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 5c24b16e0ff..6fd34786768 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "ගුප්ත කේතනය"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "යාවත්කාල කිරීම"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "ආරක්ෂක නිවේදනයක්"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "හුවමාරු කිරීම"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "යොමු සලසන්න"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "යළි යළිත් හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "හුවමාරු කළ  හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "සේවාදායකයේ ලිපිනය"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "තොට"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "ලඝුව"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "වැඩි"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "අඩු"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 175aba8b811..ed0af373d58 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 9ac34b7c25d..65348532a41 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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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,36 +17,27 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,67 +134,67 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -243,32 +234,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -301,11 +300,11 @@ msgid "Share"
 msgstr "Zdieľať"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -421,19 +420,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -547,6 +546,18 @@ 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 "Osobné"
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 304ed950fb9..6f6661a4078 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,94 +156,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -281,29 +281,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -311,113 +303,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index 536ee6f6b94..55edeaf3586 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 0e98417ded1..56224c08da5 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -340,3 +340,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 45cd212519c..c4904394fe3 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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 2e3098a1e2a..76ac5cd2ac8 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 702c9c44eee..87b17aa9d8a 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "   \t\nDátum expirácie spadá do minulosti."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nebolo možné odoslať email týmto používateľom: %s "
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Mód údržby je zapnutý"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Mód údržby e vypnutý"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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ý"
@@ -145,67 +136,67 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Ukladám..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:996
+#: js/js.js:1125
 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:997
+#: js/js.js:1126
 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:998
+#: js/js.js:1127
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:1000
+#: js/js.js:1129
 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:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:1002
+#: js/js.js:1131
 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:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -245,54 +236,62 @@ msgid "One file conflict"
 msgstr "Jeden konflikt súboru"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nové súbory"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Ktoré súbory chcete ponechať?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Pokračovať"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(všetko vybrané)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} vybraných)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 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 ""
+msgstr "Veľmi slabé heslo"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Slabé heslo"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Priemerné heslo"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Dobré heslo"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Silné heslo"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -303,11 +302,11 @@ msgid "Share"
 msgstr "Zdieľať"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Chyba"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Chyba počas zdieľania"
 
@@ -423,19 +422,19 @@ msgstr "Chránené heslom"
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraňovaní dátumu expirácie"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavení dátumu expirácie"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email odoslaný"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Varovanie"
 
@@ -491,7 +490,7 @@ msgstr "reset hesla %s"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Vyskytol sa problém pri odosielaní emailu, prosím obráťte sa na správcu."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -549,6 +548,18 @@ msgstr "Nové heslo"
 msgid "Reset password"
 msgstr "Obnovenie hesla"
 
+#: 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 nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!"
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Osobné"
@@ -613,7 +624,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 s tebou zdieľa %s.\nTu je odkaz: %s\n\n"
+msgstr "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
@@ -669,7 +680,7 @@ msgstr "Vytvoriť <strong>administrátorský účet</strong>"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Úložislo & databáza"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -770,7 +781,7 @@ msgstr "Alternatívne prihlásenie"
 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 ""
+msgstr "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>"
 
 #: 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 2bc5aac1a09..c3cda0fa890 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,48 +18,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" je neplatné meno súboru."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Cieľový priečinok bol premiestnený alebo odstránený."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Neplatný zdroj"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Server nie je oprávnený otvárať adresy URL. Overte nastavenia servera."
@@ -69,74 +69,74 @@ msgstr "Server nie je oprávnený otvárať adresy URL. Overte nastavenia server
 msgid "Error while downloading %s to %s"
 msgstr "Chyba pri sťahovaní súboru %s do %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Chyba pri vytváraní priečinka"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Nemožno nastaviť priečinok pre nahrané súbory."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Neplatný token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol nahraný. Neznáma chyba"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Nenastala žiadna chyba, súbor bol úspešne nahraný"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Nedostatok dostupného úložného priestoru"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Neplatný priečinok."
 
@@ -150,101 +150,101 @@ msgstr "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má
 
 #: js/file-upload.js:258
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Celková veľkosť súboru {size1} prekračuje upload limit {size2}"
 
 #: js/file-upload.js:268
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}"
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Nepodarilo sa dostať výsledky zo servera."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL nemôže byť prázdna"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Nemožno vytvoriť súbor"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Nemožno vytvoriť priečinok"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Chyba pri načítavaní URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Zmazať  trvalo"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Chyba pri presúvaní súboru"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Chyba"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Prebieha"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Nemožno premenovať súbor"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "prepísaný {new_name} súborom {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "vrátiť"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Chyba pri mazaní súboru."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 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:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} a {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávam %n súbor"
@@ -253,7 +253,7 @@ msgstr[2] "Nahrávam %n súborov"
 
 #: js/files.js:96
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" je neplatné meno súboru."
 
 #: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
@@ -282,29 +282,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Chyba pri presúvaní súboru"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Chyba"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Upravené"
 
@@ -312,113 +304,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nemohol byť premenovaný"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Odoslať"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Nastavenie správania sa k súborom"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximálna veľkosť odosielaného súboru"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "najväčšie možné:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Vyžadované pre sťahovanie viacerých súborov a priečinkov."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Povoliť sťahovanie ZIP súborov"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 znamená neobmedzené"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Najväčšia veľkosť ZIP súborov"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Nový"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nový textový súbor"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Textový súbor"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Priečinok"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Zmazané súbory"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Žiadny súbor. Nahrajte niečo!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Sťahovanie"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Zmazať"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Nahrávanie je príliš veľké"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/sk_SK/files_external.po
index 5ac968e0c46..0a04a512b63 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Zadajte platný kľúč aplikácie a heslo Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba pri konfigurácii úložiska Google drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
+msgstr "Uložené"
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Varovanie:</b> nie je nainštalovaná, alebo povolená, podpora Curl v PHP. Nie je možné pripojenie oddielov ownCloud, WebDAV, či GoogleDrive. Prosím požiadajte svojho administrátora systému, nech ju nainštaluje."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Externé úložisko"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Názov priečinka"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Externé úložisko"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Nastavenia"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Aplikovateľné"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Pridať úložisko"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Žiadne nastavené"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Všetci používatelia"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Používatelia"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Zmazať"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Povoliť externé úložisko"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Koreňové SSL certifikáty"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 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 74a307337e5..fafef561bd3 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-01 01:55-0400\n"
+"PO-Revision-Date: 2014-03-31 10:40+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +66,7 @@ msgstr "Zdieľa %s"
 #: templates/public.php:44
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Stiahnuť %s"
 
 #: templates/public.php:48
 msgid "Direct link"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 41d6fb61393..10d44986712 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.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
 # martin, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -67,23 +67,23 @@ msgstr "Chybný obrázok"
 msgid "web services under your control"
 msgstr "webové služby pod Vašou kontrolou"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Sťahovanie súborov ZIP je vypnuté."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Súbory musia byť nahrávané jeden za druhým."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Späť na súbory"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -159,7 +159,7 @@ msgstr "Token vypršal. Obnovte, prosím, stránku."
 
 #: private/json.php:75
 msgid "Unknown user"
-msgstr ""
+msgstr "Neznámy používateľ"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -194,8 +194,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Používateľské meno, alebo heslo MS SQL nie je 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 zadať jestvujúci účet alebo administrátora."
 
@@ -208,9 +208,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 "Chyba DB: \"%s\""
@@ -219,9 +219,9 @@ msgstr "Chyba 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 "Podozrivý príkaz bol: \"%s\""
@@ -257,7 +257,7 @@ msgstr "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Podozrivý príkaz bol: \"%s\", meno: %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 "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné"
 
@@ -269,19 +269,19 @@ msgstr "Zadajte používateľské meno administrátora."
 msgid "Set an admin password."
 msgstr "Zadajte heslo administrátora."
 
-#: private/setup.php:198
+#: 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 nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s s vami zdieľa »%s«"
@@ -342,3 +342,21 @@ msgstr "minulý rok"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "pred rokmi"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Musíte zadať platné používateľské meno"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Musíte zadať platné heslo"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 93cc730e3a8..8aecaab335b 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Uložené"
 
 #: admin/controller.php:90
 msgid "test email settings"
@@ -49,24 +49,24 @@ msgstr "Email odoslaný"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
-msgstr ""
+msgstr "Mód odosielania"
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Šifrovanie"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
-msgstr ""
+msgstr "Autentifikačná metóda"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Nie je možné nahrať zoznam z 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 "Chyba autentifikácie"
 
@@ -128,38 +128,38 @@ msgstr "Nie je možné odstrániť používateľa zo skupiny %s"
 msgid "Couldn't update app."
 msgstr "Nemožno aktualizovať aplikáciu."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Nesprávne heslo"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Nebol uvedený používateľ"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu."
 
-#: 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 "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Zmena hesla sa nepodarila"
 
 #: js/admin.js:73
 msgid "Sending..."
-msgstr ""
+msgstr "Odosielam..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -167,7 +167,7 @@ msgstr "Príručka používateľa"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Príručka správcu"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -205,7 +205,7 @@ msgstr "chyba pri aktualizácii aplikácie"
 msgid "Error"
 msgstr "Chyba"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Aktualizovať"
 
@@ -213,31 +213,31 @@ msgstr "Aktualizovať"
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Vybrať avatara"
 
 #: js/personal.js:274
 msgid "Very weak password"
-msgstr ""
+msgstr "Veľmi slabé heslo"
 
 #: js/personal.js:275
 msgid "Weak password"
-msgstr ""
+msgstr "Slabé heslo"
 
 #: js/personal.js:276
 msgid "So-so password"
-msgstr ""
+msgstr "Priemerné heslo"
 
 #: js/personal.js:277
 msgid "Good password"
-msgstr ""
+msgstr "Dobré heslo"
 
 #: js/personal.js:278
 msgid "Strong password"
-msgstr ""
+msgstr "Silné heslo"
 
-#: js/personal.js:301
+#: js/personal.js:313
 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ť."
 
@@ -286,7 +286,7 @@ msgstr "Musíte zadať platné heslo"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -324,28 +324,28 @@ msgstr ""
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "NT LAN Manager"
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Bezpečnostné upozornenie"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "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:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -354,68 +354,68 @@ msgid ""
 "root."
 msgstr "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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Nastavenia oznámení"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Chýba modul 'fileinfo'"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Vaša PHP verzia je zastaraná"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "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:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalizácia nefunguje"
 
-#: templates/admin.php:119
+#: 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:123
+#: 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:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "Dô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:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Pripojenie na internet nefunguje"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -424,162 +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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Zdieľanie"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Povoliť API zdieľania"
 
-#: templates/admin.php:191
+#: 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:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Povoliť odkazy"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Povoliť verejné nahrávanie súborov"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Povoliť zdieľanie ďalej"
 
-#: templates/admin.php:217
+#: 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:224
+#: 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:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Povoliť odosielať upozornenia emailom"
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Povoliť používateľom odosielať upozornenia emailom pre svoje zdieľané súbory"
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Zabezpečenie"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Vynútiť HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
-msgstr ""
+msgstr "Email server"
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
-msgstr ""
+msgstr "Z adresy"
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Adresa servera"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Prihlasovanie údaje"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP používateľské meno"
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP heslo"
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
-msgstr ""
+msgstr "Odoslať email"
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +613,23 @@ msgstr "Pridať vašu aplikáciu"
 msgid "More Apps"
 msgstr "Viac aplikácií"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Vyberte aplikáciu"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "Dokumentácia:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Pozrite si stránku aplikácií na apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
-msgstr ""
+msgstr "Pozrite si webstránku aplikácie"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>"
 
@@ -650,108 +666,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Vaše heslo bolo zmenené"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Nie je možné zmeniť vaše heslo"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Aktuálne heslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Meno a priezvisko"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Vaša emailová adresa"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Avatar"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Nahrať nový"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Vyberte nový zo súborov"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Zmazať obrázok"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Formát súboru png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať."
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Váš avatar je použitý z pôvodného účtu."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Vybrať ako avatara"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Pomôcť s prekladom"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Prihlasovacie heslo"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Dešifrovať všetky súbory"
 
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 09793a0baf8..38484ed97b5 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -423,41 +423,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Špeciálne atribúty"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Pole kvóty"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Predvolená kvóta"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "v bajtoch"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Pole emailu"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pre nastavenie názvu používateľského priečinka dát"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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 z LDAP/AD."
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Interné používateľské meno"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -473,15 +484,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby *DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atribút interného používateľského mena:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Prepísať UUID detekciu"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
 "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ží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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID atribút pre používateľov:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID atribút pre skupiny:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Mapovanie názvov LDAP používateľských mien"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -518,10 +529,10 @@ msgid ""
 "experimental stage."
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Zrušiť mapovanie LDAP používateľských mien"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Zrušiť mapovanie názvov LDAP skupín"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 7375718b19d..c0887239b2e 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 19:30+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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,36 +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:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Datum preteka je v preteklosti."
+
+#: 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"
@@ -145,19 +136,19 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minuto"
@@ -165,7 +156,7 @@ msgstr[1] "pred %n minutama"
 msgstr[2] "pred %n minutami"
 msgstr[3] "pred %n minutami"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n uro"
@@ -173,15 +164,15 @@ msgstr[1] "pred %n urama"
 msgstr[2] "pred %n urami"
 msgstr[3] "pred %n urami"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "včeraj"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dnevom"
@@ -189,11 +180,11 @@ msgstr[1] "pred %n dnevoma"
 msgstr[2] "pred %n dnevi"
 msgstr[3] "pred %n dnevi"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesecem"
@@ -201,15 +192,15 @@ msgstr[1] "pred %n mesecema"
 msgstr[2] "pred %n meseci"
 msgstr[3] "pred %n meseci"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -250,32 +241,40 @@ msgid "One file conflict"
 msgstr "En spor datotek"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nove datoteke"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Katare datoteke želite ohraniti?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(vse izbrano)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} izbranih)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Napaka nalaganja predloge obstoječih datotek"
 
@@ -308,11 +307,11 @@ msgid "Share"
 msgstr "Souporaba"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Napaka"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
@@ -428,19 +427,19 @@ msgstr "Zaščiteno z geslom"
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Napaka nastavljanja datuma preteka"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Pošiljanje ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Elektronska pošta je poslana"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Opozorilo"
 
@@ -554,6 +553,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"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 61b6cf26e3a..973e7e04a88 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/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-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 19:21+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +19,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/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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" je neveljavno ime datoteke."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
 msgstr "Ciljna mapa je premaknjena ali izbrisana."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Vir ni veljaven"
 
-#: ajax/newfile.php:101
+#: 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."
@@ -70,74 +70,74 @@ msgstr "Odpiranje naslovov URL preko strežnika ni dovoljeno. Preverite nastavit
 msgid "Error while downloading %s to %s"
 msgstr "Napaka med prejemanjem %s v mapo %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Napaka med ustvarjanjem mape"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Mapo, v katero boste prenašali dokumente, ni mogoče določiti"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Neveljaven žeton"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ni poslane datoteke. Neznana napaka."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je uspešno naložena."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslan je le del datoteke."
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ni poslane datoteke"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Na voljo ni dovolj prostora"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Pošiljanje je spodletelo. Ni mogoče najti poslane datoteke."
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Neveljavna mapa."
 
@@ -158,76 +158,76 @@ 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "Polje naslova URL ne sme biti prazno"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Ni mogoče ustvariti datoteke"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Ni mogoče ustvariti mape"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Napaka pridobivanja naslova URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Izbriši dokončno"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Napaka premikanja datoteke"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Napaka"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Ni mogoče preimenovati datoteke"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "preimenovano ime {new_name} z imenom {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "razveljavi"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Napaka brisanja datoteke."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapa"
@@ -235,7 +235,7 @@ msgstr[1] "%n mapi"
 msgstr[2] "%n mape"
 msgstr[3] "%n map"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n datoteka"
@@ -243,11 +243,11 @@ msgstr[1] "%n datoteki"
 msgstr[2] "%n datoteke"
 msgstr[3] "%n datotek"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} in {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Posodabljanje %n datoteke"
@@ -286,29 +286,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Napaka premikanja datoteke"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Napaka"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Spremenjeno"
 
@@ -316,113 +308,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ni mogoče preimenovati"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Pošlji"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Upravljanje z datotekami"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Največja velikost za pošiljanja"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "največ mogoče:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Uporabljeno za prejem več datotek in map."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Omogoči prejemanje arhivov ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 predstavlja neomejeno vrednost"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Največja vhodna velikost za datoteke ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Nova besedilna datoteka"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Besedilna datoteka"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Mapa"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Iz povezave"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Izbrisane datoteke"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Prekliči pošiljanje"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Prekoračenje omejitve velikosti"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preučevanje datotek, počakajte ..."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/sl/files_external.po
index b8a82d1425d..46ee2ccbc17 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/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: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 19:30+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 05:55+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"
@@ -38,91 +38,100 @@ msgstr "Vpisati je treba veljaven ključ programa in kodo za Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Napaka nastavljanja shrambe Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Shranjeno"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Zunanja podatkovna shramba"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Ime mape"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Zunanja shramba"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Nastavitve"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Se uporablja"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Na voljo za"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Dodaj shrambo"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ni nastavljeno"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Ni uporabnika ali skupine"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Vsi uporabniki"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Uporabniki"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Omogoči zunanjo uporabniško podatkovno shrambo"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Korenska potrdila SSL"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Uvozi korensko potrdilo"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index b5a1d0e092d..6593ed803c0 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 19:30+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -67,23 +67,23 @@ msgstr "Neveljavna slika"
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Prejemanje datotek v paketu ZIP je onemogočeno."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoče prejeti le posamično."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -269,19 +269,19 @@ msgstr "Nastavi uporabniško ime skrbnika."
 msgid "Set an admin password."
 msgstr "Nastavi geslo skrbnika."
 
-#: private/setup.php:198
+#: 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 "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Preverite <a href='%s'>navodila namestitve</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s je omogočil souporabo »%s«"
@@ -346,3 +346,21 @@ msgstr "lansko leto"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "let nazaj"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Navedeno mora biti veljavno uporabniško ime"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Navedeno mora biti veljavno geslo"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index ab3a6bcf560..23a92432934 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 19:30+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Navedena je napačna vrednost za %s"
 
 #: admin/controller.php:73
 msgid "Saved"
@@ -30,7 +30,7 @@ msgstr "Shranjeno"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "preizkusi nastavitve elektronske pošte"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
@@ -49,15 +49,15 @@ msgstr "Elektronska pošta je poslana"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Način pošiljanja"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Šifriranje"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Način overitve"
 
@@ -66,7 +66,7 @@ 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"
 
@@ -128,32 +128,32 @@ 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"
 
@@ -205,7 +205,7 @@ msgstr "Prišlo je do napake med posodabljanjem programa."
 msgid "Error"
 msgstr "Napaka"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Posodobi"
 
@@ -213,31 +213,31 @@ msgstr "Posodobi"
 msgid "Updated"
 msgstr "Posodobljeno"
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Izbor slike profila"
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr "Zelo šibko geslo"
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr "Šibko geslo"
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr "Slabo geslo"
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr "Dobro geslo"
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr "Odlično geslo"
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno."
 
@@ -286,7 +286,7 @@ msgstr "Navedeno mora biti veljavno geslo"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Slovenščina"
 
@@ -429,157 +429,173 @@ msgid "Cron"
 msgstr "Periodično opravilo"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Souporaba"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Omogoči API souporabe"
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Dovoli programom uporabo vmesnika API souporabe"
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Dovoli povezave"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Dovoli javno pošiljanje datotek v oblak"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Dovoli nadaljnjo souporabo"
 
-#: templates/admin.php:221
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
 
-#: templates/admin.php:228
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
-#: templates/admin.php:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Dovoli obvestila preko elektronske pošte"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Varnost"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Zahtevaj uporabo HTTPS"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "Poštni strežnik"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Zahtevana je overitev"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Poverila"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "Uporabniško ime SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "Geslo SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "Preizkus nastavitev elektronske pošte"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "Pošlji elektronsko sporočilo"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Raven beleženja"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Več"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Različica"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -597,23 +613,23 @@ msgstr "Dodaj program"
 msgid "More Apps"
 msgstr "Več programov"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Izbor programa"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Dokumentacija:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Obiščite spletno stran programa na apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Oglejte si spletno stran programa"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>"
 
@@ -650,108 +666,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Geslo je spremenjeno"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Gesla ni mogoče spremeniti."
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Novo geslo"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Elektronski naslov"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Osebni elektronski naslov"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Slika profila"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Pošlji novo"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Izberi novo iz menija datotek"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Odstrani sliko"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "Podoba je podana v izvornem računu."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Izberi kot sliko profila"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Sodelujte pri prevajanju"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Prijavno geslo"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Odšifriraj vse datoteke"
 
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index b5478c054ec..ecfe45ca6b2 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: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,7 +417,7 @@ msgstr "Povezava član-skupina"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+msgstr "Gnezdene skupine"
 
 #: templates/settings.php:39
 msgid ""
@@ -425,41 +425,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Posebni atributi"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Polje količinske omejitve"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Privzeta količinska omejitev"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "v bajtih"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Polje elektronske pošte"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Pravila poimenovanja uporabniške osebne mape"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Programsko uporabniško ime"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -475,15 +486,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Programski atribut uporabniškega imena:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Prezri zaznavo UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -494,19 +505,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Atribut UUID za uporabnike:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Atribut UUID za skupine:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Uporabniška preslikava uporabniškega imena na LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -520,10 +531,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Izbriši preslikavo uporabniškega imena na LDAP"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 83e9196a368..776c5cef955 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 "Mënyra e mirëmbajtjes u aktivizua"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Mënyra e mirëmbajtjes u çaktivizua"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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 ""
@@ -145,63 +136,63 @@ msgstr "Nëntor"
 msgid "December"
 msgstr "Dhjetor"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Parametra"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Duke ruajtur..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut më parë"
 msgstr[1] "%n minuta më parë"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n orë më parë"
 msgstr[1] "%n orë më parë"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ditë më parë"
 msgstr[1] "%n ditë më parë"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n muaj më parë"
 msgstr[1] "%n muaj më parë"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "muaj më parë"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "vite më parë"
 
@@ -240,32 +231,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Anulo"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -298,11 +297,11 @@ msgid "Share"
 msgstr "Nda"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Veprim i gabuar gjatë ndarjes"
 
@@ -418,19 +417,19 @@ msgstr "Mbrojtur me kod"
 msgid "Error unsetting expiration date"
 msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Duke dërguar..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email-i u dërgua"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -544,6 +543,18 @@ msgstr "Kodi i ri"
 msgid "Reset password"
 msgstr "Rivendos kodin"
 
+#: 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 "Personale"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 0daf7af24dd..d1ac372f741 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -19,48 +19,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -70,74 +70,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "E pa mundur të vendoset dosja e ngarkimit"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Shenjë e gabuar"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Asnjë skedar nuk u dërgua. Gabim i pa njohur"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Skedari u ngarkua me sukses"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Skedari është ngakruar vetëm pjesërisht"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Asnjë skedar nuk është ngarkuar"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Mungon dosja e përkohshme"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Dështoi shkrimi në disk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Hapsira e arkivimit e pamjaftueshme"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Dosje e pavlefshme"
 
@@ -158,92 +158,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Ngarkimi u anullua"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL-i nuk mund të jetë bosh"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} është ekzistues "
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "I pamundur krijimi i kartelës"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Ndaj"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Fshi përfundimisht"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Riemëro"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Gabim lëvizjen dokumentave"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Gabim"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Në vijim"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "u zëvendësua {new_name} me {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "anullo"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosje"
 msgstr[1] "%n dosje"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n skedar"
 msgstr[1] "%n skedarë"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} dhe {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Po ngarkoj %n skedar"
@@ -280,29 +280,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Gabim lëvizjen dokumentave"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Gabim"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Madhësia"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Ndryshuar"
 
@@ -310,113 +302,109 @@ msgstr "Ndryshuar"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Nuk është i mundur riemërtimi i %s"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Ngarko"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Trajtimi i Skedarëve"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Madhësia maksimale e nagarkimit"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "maks i mundshëm"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Nevojitej shkarkim i shumë skedarëve dhe dosjeve"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Mundëso skarkimin e ZIP"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "o është pa limit"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimumi hyrës i skedarëve ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Ruaj"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "E re"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Skedar tekst"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Dosje e're"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Dosje"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Nga lidhja"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Skedarë të fshirë "
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Anullo ngarkimin"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Këtu nuk ka asgje. Ngarko dicka"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Fshi"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Ngarkimi shumë i madh"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Skanerizimi i skedarit në proces. Ju lutem prisni."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/sq/files_external.po
index 4744e08c445..27f4c28f011 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupet"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Elimino"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 9588cd47857..1e227ddd183 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "shërbime web nën kontrollin tënd"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Skedarët duhet të shkarkohen një nga një."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Kthehu tek skedarët"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %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 "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit."
 
@@ -206,9 +206,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 "Veprim i gabuar i DB-it: \"%s\""
@@ -217,9 +217,9 @@ msgstr "Veprim i gabuar i DB-it: \"%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 "Komanda e gabuar ishte: \"%s\""
@@ -255,7 +255,7 @@ msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %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 "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm"
 
@@ -267,19 +267,19 @@ msgstr "Cakto emrin e administratorit."
 msgid "Set an admin password."
 msgstr "Cakto kodin e administratorit."
 
-#: private/setup.php:198
+#: 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 "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:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ndau »%s« me ju"
@@ -336,3 +336,21 @@ msgstr "vitin e shkuar"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "vite më parë"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Duhet të jepni një emër të vlefshëm përdoruesi"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Duhet të jepni një fjalëkalim te vlefshëm"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index cdb29a4cdcf..8d2970bcdc2 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -47,15 +47,15 @@ msgstr "Email-i u dërgua"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgid "Unable to load list from App Store"
 msgstr "E pamundur të shkarkohet lista nga 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 "Gabim autentifikimi"
 
@@ -126,32 +126,32 @@ msgstr "E pamundur të hiqet përdoruesi nga grupi %s"
 msgid "Couldn't update app."
 msgstr "E pamundur të përditësohet app."
 
-#: 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 ""
 
@@ -203,7 +203,7 @@ msgstr "Gabim gjatë përditësimit të app"
 msgid "Error"
 msgstr "Gabim"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Përditësim"
 
@@ -211,7 +211,7 @@ msgstr "Përditësim"
 msgid "Updated"
 msgstr "I përditësuar"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -284,7 +284,7 @@ msgstr "Duhet të jepni një fjalëkalim te vlefshëm"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Shqip"
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Njoftim për sigurinë"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Lajmërim konfigurimi"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "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:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Mungon moduli 'fileinfo'"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale nuk është funksional"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Lidhja me internetin nuk është funksionale"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Ndarje"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktivizo API për ndarjet"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Lejoni aplikacionet të përdorin share API"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Lejo lidhjet"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Lejo ngarkimin publik"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Lejo ri-ndarjen"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Lejo përdoruesit të ndajnë me cilindo"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Siguria"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Detyro HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Historik aktiviteti"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Niveli i Historikut"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Më tepër"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "M'pak"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Versioni"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -595,23 +611,23 @@ msgstr "Shtoni apliakcionin tuaj"
 msgid "More Apps"
 msgstr "Apliakcione të tjera"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Zgjidhni një Aplikacion"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Shihni faqen e aplikacionit tek apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensuar nga <span class=\"author\"></span>"
 
@@ -648,108 +664,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Fjalëkalim"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "fjalëkalimi juaj u ndryshua"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Nuk është e mundur të ndryshohet fjalëkalimi"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Fjalëkalimi aktual"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Fjalëkalimi i ri"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Ndrysho fjalëkalimin"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Adresa juaj email"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Anullo"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Gjuha"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Ndihmoni në përkthim"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 82db1279b91..963d74c361b 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Atribute të veçanta"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Hapsira e Kuotës"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Kuota e paracaktuar"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "në byte"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Hapsira e Postës Elektronike"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Rregulli i emërimit të dosjes së përdoruesit"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Emër i brëndshëm i përdoruesit"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Atributet e emrit të përdoruesit të brëndshëm"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Mbivendosni gjetjen e UUID"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Emri përdoruesit-LAPD përcaktues përdoruesi"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Fshini Emër përdoruesi-LAPD Përcaktues përdoruesi"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 55cd4965254..4c5eb4cf733 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,67 +134,67 @@ msgstr "Новембар"
 msgid "December"
 msgstr "Децембар"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Поставке"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Чување у току..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "месеци раније"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "година раније"
 
@@ -243,32 +234,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Откажи"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -301,11 +300,11 @@ msgid "Share"
 msgstr "Дели"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Грешка у дељењу"
 
@@ -421,19 +420,19 @@ msgstr "Заштићено лозинком"
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума истека"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Грешка код постављања датума истека"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Шаљем..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Порука је послата"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Упозорење"
 
@@ -547,6 +546,18 @@ 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 "Лично"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 80abf6aa8bf..c7edf1b2774 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +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/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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Име датотеке не може бити празно."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниједна датотека није отпремљена услед непознате грешке"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Није дошло до грешке. Датотека је успешно отпремљена."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотека је делимично отпремљена"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Датотека није отпремљена"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Недостаје привремена фасцикла"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Не могу да пишем на диск"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Нема довољно простора"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "неисправна фасцикла."
 
@@ -156,94 +156,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Дели"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Обриши за стално"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Грешка"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "замењено {new_name} са {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "опозови"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -281,29 +281,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Измењено"
 
@@ -311,113 +303,109 @@ msgstr "Измењено"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Отпреми"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Управљање датотекама"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Највећа величина датотеке"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "највећа величина:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Неопходно за преузимање вишеделних датотека и фасцикли."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Омогући преузимање у ZIP-у"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 је неограничено"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Највећа величина ZIP датотека"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Сачувај"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Нова"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "текстуална датотека"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "фасцикла"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Са везе"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Обрисане датотеке"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Отпремите нешто!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Датотека је превелика"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеке које желите да отпремите прелазе ограничење у величини."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Скенирам датотеке…"
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Дограђујем кеш система датотека…"
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 2077f942d6c..ac5a5f2331c 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Групе"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Корисници"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index d2832922e6d..9cd072c745e 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Преузимање ZIP-а је искључено."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеке морате преузимати једну по једну."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Назад на датотеке"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Изабране датотеке су превелике да бисте направили ZIP датотеку."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -340,3 +340,21 @@ msgstr "прошле године"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "година раније"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Морате унети исправно корисничко име"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Морате унети исправну лозинку"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 3957b136468..ad83bcb144a 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -47,15 +47,15 @@ msgstr "Порука је послата"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Шифровање"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -64,7 +64,7 @@ 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 "Грешка при провери идентитета"
 
@@ -126,32 +126,32 @@ msgstr "Не могу да уклоним корисника из групе %s"
 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 ""
 
@@ -203,7 +203,7 @@ msgstr "Грешка при ажурирању апликације"
 msgid "Error"
 msgstr "Грешка"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Ажурирај"
 
@@ -211,7 +211,7 @@ msgstr "Ажурирај"
 msgid "Updated"
 msgstr "Ажурирано"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -284,7 +284,7 @@ msgstr "Морате унети исправну лозинку"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Сигурносно упозорење"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Упозорење о подешавању"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Недостаје модул „fileinfo“"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Локализација не ради"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Веза с интернетом не ради"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Дељење"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Омогући API Share"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Дозвољава апликацијама да користе API Share"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Дозволи везе"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволи корисницима да деле ставке с другима путем веза"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Дозволи поновно дељење"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволи корисницима да поновно деле ставке с другима"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Дозволи корисницима да деле са било ким"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволи корисницима да деле само са корисницима у њиховим групама"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Безбедност"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Наметни HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Адреса сервера"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Бележење"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Ниво бележења"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Више"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Мање"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -595,23 +611,23 @@ msgstr "Додајте ваш програм"
 msgid "More Apps"
 msgstr "Више програма"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Изаберите програм"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Погледајте страницу са програмима на apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>"
 
@@ -648,108 +664,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Лозинка је промењена"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Не могу да изменим вашу лозинку"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Тренутна лозинка"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Измени лозинку"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Ваша адреса е-поште"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Откажи"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Језик"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr " Помозите у превођењу"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 03929445d00..3e050f44943 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "у бајтовима"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index e2d5987455b..f10dd683cd2 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 23:21+0000\n"
-"Last-Translator: greatbalsa <balsa.l@live.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -19,36 +19,27 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -145,67 +136,67 @@ msgstr "Novembar"
 msgid "December"
 msgstr "Decembar"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "Pre par sekundi"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "Danas"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "juče"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Prije %n dan."
 msgstr[1] "Prije %n dana."
 msgstr[2] "Prije %n dana."
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "prošlog meseca"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "pre nekoliko meseci"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "prošle godine"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "pre nekoliko godina"
 
@@ -245,32 +236,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -303,11 +302,11 @@ msgid "Share"
 msgstr "Podeli"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Greška"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Greška pri deljenju"
 
@@ -423,19 +422,19 @@ msgstr "Zaštćeno lozinkom"
 msgid "Error unsetting expiration date"
 msgstr "Greška u uklanjanju datuma isteka"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Greška u postavljanju datuma isteka"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Slanje..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email poslat"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -549,6 +548,18 @@ msgstr "Nova lozinka"
 msgid "Reset password"
 msgstr "Resetuj lozinku"
 
+#: 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 "Lično"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 98fa0632780..b4de486ab40 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +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/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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema greške, fajl je uspešno poslat"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslati fajl je samo delimično otpremljen!"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Nijedan fajl nije poslat"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena fascikla"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,94 +156,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Podeli"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Preimenij"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Greška"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -281,29 +281,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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 "Greška"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Zadnja izmena"
 
@@ -311,113 +303,109 @@ msgstr "Zadnja izmena"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Pošalji"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimalna veličina pošiljke"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Snimi"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ničeg. Pošaljite nešto!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 70156cba68b..036e65f4a2c 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Korisnici"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 9e437d4e7fe..0f3d0d7a092 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 23:21+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -340,3 +340,21 @@ msgstr "prošle godine"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "pre nekoliko godina"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 65a8aa61a5e..61ac8239bce 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr "Email poslat"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Bezbednosno upozorenje"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 91af0333798..ff6b66a5c7d 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/su/core.po b/l10n/su/core.po
index 113cf81cfa1..ac15217b14a 100644
--- a/l10n/su/core.po
+++ b/l10n/su/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: su\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -411,19 +410,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -537,6 +536,18 @@ 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 ""
diff --git a/l10n/su/files.po b/l10n/su/files.po
index 7ac8a61757c..f02bfd4f577 100644
--- a/l10n/su/files.po
+++ b/l10n/su/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: su\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -305,113 +297,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/su/files_external.po b/l10n/su/files_external.po
index ad5375c9f45..206f00c67ea 100644
--- a/l10n/su/files_external.po
+++ b/l10n/su/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/su/lib.po b/l10n/su/lib.po
index 15649f4f65d..9d0019b5f50 100644
--- a/l10n/su/lib.po
+++ b/l10n/su/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/su/settings.po b/l10n/su/settings.po
index 289be4aad23..f93147a8bca 100644
--- a/l10n/su/settings.po
+++ b/l10n/su/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/su/user_ldap.po b/l10n/su/user_ldap.po
index aa4721f182c..b7878fb8312 100644
--- a/l10n/su/user_ldap.po
+++ b/l10n/su/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 46dd79ac845..affc664f21b 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AsavarTzeth <asavartzeth@gmail.com>, 2014
 # Daniel Sandman <revoltism@gmail.com>, 2013
 # Gunnar Norin <blittan@xbmc.org>, 2013
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 18:10+0000\n"
+"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,36 +25,27 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Utgångsdatumet är i det förflutna."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Gick inte att skicka e-post till följande användare: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Aktiverade underhållsläge"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Deaktiverade underhållsläge"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -150,63 +142,63 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut sedan"
 msgstr[1] "%n minuter sedan"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n timme sedan"
 msgstr[1] "%n timmar sedan"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sedan"
 msgstr[1] "%n dagar sedan"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sedan"
 msgstr[1] "%n månader sedan"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "år sedan"
 
@@ -245,54 +237,62 @@ msgid "One file conflict"
 msgstr "En filkonflikt"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Nya filer"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr "Filer som redan existerar"
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Vilken fil vill du behålla?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(Alla valda)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} valda)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Fel uppstod filmall existerar"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Väldigt svagt lösenord"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Svagt lösenord"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Okej lösenord"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Bra lösenord"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Starkt lösenord"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -303,11 +303,11 @@ msgid "Share"
 msgstr "Dela"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fel"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
@@ -423,19 +423,19 @@ msgstr "Lösenordsskyddad"
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgångsdatum"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fel vid sättning av utgångsdatum"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-post skickat"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Varning"
 
@@ -469,7 +469,7 @@ msgstr "Inga taggar valda för borttagning."
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "Vänligen ladda om sidan."
 
 #: js/update.js:17
 msgid ""
@@ -491,7 +491,7 @@ msgstr "%s återställ lösenord"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Ett problem har uppstått under tiden e-post sändes, vänligen kontakta din administratör."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -549,6 +549,18 @@ msgstr "Nytt lösenord"
 msgid "Reset password"
 msgstr "Återställ lösenordet"
 
+#: 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 stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!"
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "För bästa resultat, överväg att använda en GNU/Linux server istället."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personligt"
@@ -669,7 +681,7 @@ msgstr "Skapa ett <strong>administratörskonto</strong>"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Lagring & databas"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -716,7 +728,7 @@ 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 "Denna applikation kräver JavaScript aktiverat för att fungera korrekt. Vänligen <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivera JavaScript</a> och ladda om gränssnittet."
 
 #: templates/layout.user.php:44
 #, php-format
@@ -770,15 +782,15 @@ msgstr "Alternativa inloggningar"
 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 ""
+msgstr "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
+msgstr "Denna ownCloud instans är för närvarande i enanvändarläge"
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
-msgstr ""
+msgstr "Detta betyder att endast administartörer kan använda instansen."
 
 #: templates/singleuser.user.php:5 templates/update.user.php:5
 msgid ""
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 58b3f25f830..bb8d42d051a 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AsavarTzeth <asavartzeth@gmail.com>, 2014
 # DanielMalmgren <daniel@kolefors.se>, 2013
 # Daniel Sandman <revoltism@gmail.com>, 2013
 # Gunnar Norin <blittan@xbmc.org>, 2013
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-06 01:55-0400\n"
+"PO-Revision-Date: 2014-04-05 18:40+0000\n"
+"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,125 +26,125 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Filnamn kan inte vara tomt."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" är ett ogiltigt filnamn."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Målmappen har flyttats eller tagits bort."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Inte en giltig källa"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "Servern är inte tillåten att öppna URL:er, vänligen kontrollera server konfigurationen"
 
 #: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Fel under nerladdning från %s till %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fel under skapande utav en katalog"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Kan inte sätta mapp för uppladdning."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Ogiltig token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var endast delvis uppladdad"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Ingen fil laddades upp"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "En temporär mapp saknas"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Misslyckades spara till disk"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Uppladdning misslyckades. Gick inte att hämta filinformation."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
@@ -157,99 +158,99 @@ msgstr "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller ha
 
 #: js/file-upload.js:258
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}"
 
 #: js/file-upload.js:268
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar."
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL kan ej vara tomt"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "I hemma katalogen 'Delat' är ett reserverat filnamn"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Kunde ej skapa fil"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Kunde ej skapa katalog"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
-msgstr ""
+msgstr "Fel vid hämtning av URL"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Dela"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Fel uppstod vid flyttning av fil"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Fel"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Kan ej byta filnamn"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "ersatt {new_name} med {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "ångra"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Kunde inte ta bort filen."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapp"
 msgstr[1] "%n mappar"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} och {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laddar upp %n fil"
@@ -257,7 +258,7 @@ msgstr[1] "Laddar upp %n filer"
 
 #: js/files.js:96
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" är ett ogiltligt filnamn."
 
 #: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
@@ -286,29 +287,21 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Fel uppstod vid flyttning av fil"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Fel"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Ändrad"
 
@@ -316,113 +309,109 @@ 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:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kunde inte namnändras"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Filhantering"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maximal storlek att ladda upp"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "max. möjligt:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Krävs för nerladdning av flera mappar och filer."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Aktivera ZIP-nerladdning"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 är oändligt"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Största tillåtna storlek för ZIP-filer"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Spara"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
-msgstr ""
+msgstr "Ny textfil"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Textfil"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Mapp"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Från länk"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Raderade filer"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:108
+#: templates/index.php:106
 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 ef12db2aaf3..eb0ddaf5935 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AsavarTzeth <asavartzeth@gmail.com>, 2014
 # Daniel Sandman <revoltism@gmail.com>, 2013
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
 # medialabs, 2013
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-06 01:55-0400\n"
+"PO-Revision-Date: 2014-04-05 18:30+0000\n"
+"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -104,11 +105,11 @@ msgstr "Följande användare har inte aktiverat kryptering:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "Initiala krypteringen har påbörjats... Detta kan ta lite tid. Var god vänta."
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Initiala krypteringen körs... Var god försök igen senare."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
@@ -118,91 +119,91 @@ msgstr "Gå direkt till din"
 msgid "personal settings"
 msgstr "personliga inställningar"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Lösenord för återställningsnyckel"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Upprepa återställningsnyckelns lösenord"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Ändra lösenord för återställningsnyckel:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Gammalt lösenord för återställningsnyckel"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nytt lösenord för återställningsnyckel"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Upprepa lösenord för ny återställningsnyckel"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Lösenordet till din privata nyckel stämmer inte längre överens med ditt inloggningslösenord:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Använd din gamla privata nyckels lösenord som ditt aktuella inloggningslösenord."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Gammalt inloggningslösenord"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Nuvarande inloggningslösenord"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Uppdatera lösenordet för din privata nyckel"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Aktivera lösenordsåterställning"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Inställningarna för filåterställning har uppdaterats"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Kunde inte uppdatera filåterställning"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 469fd35edef..a39d6384c3d 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AsavarTzeth <asavartzeth@gmail.com>, 2014
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +39,100 @@ msgstr "Ange en giltig Dropbox nyckel och hemlighet."
 msgid "Error configuring Google Drive storage"
 msgstr "Fel vid konfigurering av Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
+msgstr "Sparad"
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Varning:<b> Curl-stöd i PHP är inte aktiverat eller installerat. Montering av ownCloud / WebDAV eller GoogleDrive är inte möjligt. Vänligen be din administratör att installera det."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Extern lagring"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Mappnamn"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Extern lagring"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Alternativ"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Tillämplig"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Tillgänglig för"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Lägg till lagring"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Ingen angiven"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Ingen användare eller grupp"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Alla användare"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Användare"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Aktivera extern lagring för användare"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Tillåt användare att montera följande extern lagring"
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL rotcertifikat"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Importera rotcertifikat"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index d23ab4a6d3a..003e9595bde 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AsavarTzeth <asavartzeth@gmail.com>, 2014
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
 # Stefan Gagner <stefan@mei-ya.se>, 2013
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"PO-Revision-Date: 2014-04-06 10:50+0000\n"
+"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Delad av {owner}"
 
@@ -63,12 +64,12 @@ msgstr "För mer information, kontakta den person som skickade den här länken.
 #: templates/public.php:17
 #, php-format
 msgid "shared by %s"
-msgstr ""
+msgstr "delad av %s"
 
 #: templates/public.php:44
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Ladda ner %s"
 
 #: templates/public.php:48
 msgid "Direct link"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 34bfef2ce30..07600270a14 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AsavarTzeth <asavartzeth@gmail.com>, 2014
 # Daniel Sandman <revoltism@gmail.com>, 2013
 # medialabs, 2013
 # kallemooo <karl.h.thoren@gmail.com>, 2013
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -70,23 +71,23 @@ msgstr "Ogiltig bild"
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP är avstängd."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en åt gången."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer är för stora för att skapa zip-fil."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -162,7 +163,7 @@ msgstr "Ogiltig token. Ladda om sidan."
 
 #: private/json.php:75
 msgid "Unknown user"
-msgstr ""
+msgstr "Okänd användare"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -197,23 +198,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL-användaren och/eller lösenordet var inte giltigt: %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 måste antingen ange ett befintligt konto eller administratör."
 
 #: private/setup/mysql.php:12
 msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "MySQL/MariaDB användarnamn och/eller lösenord är felaktigt"
 
 #: 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\""
@@ -222,9 +223,9 @@ msgstr "DB error: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Det felaktiga kommandot var: \"%s\""
@@ -232,20 +233,20 @@ msgstr "Det felaktiga kommandot var: \"%s\""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL/MariaDB användare '%s'@'localhost' existerar redan."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Radera denna användare från MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB användare '%s'@'%%' existerar redan"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Radera denna användare från MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -260,7 +261,7 @@ msgstr "Oracle-användarnamnet och/eller lösenordet är felaktigt"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Det felande kommandot var: \"%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-användarnamnet och/eller lösenordet är felaktigt"
 
@@ -272,19 +273,19 @@ msgstr "Ange ett användarnamn för administratören."
 msgid "Set an admin password."
 msgstr "Ange ett administratörslösenord."
 
-#: private/setup.php:198
+#: 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 webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s delade »%s« med dig"
@@ -341,3 +342,21 @@ msgstr "förra året"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "år sedan"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Ett giltigt användarnamn måste anges"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Ett giltigt lösenord måste anges"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 2d87b768d93..af537045197 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AsavarTzeth <asavartzeth@gmail.com>, 2014
 # Daniel Sandman <revoltism@gmail.com>, 2013
 # Gunnar Norin <blittan@xbmc.org>, 2013
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,24 +30,24 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Ogiltigt värde gavs för %s"
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Sparad"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "testa e-post inställningar"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta."
 
 #: admin/controller.php:94
 msgid ""
 "A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "Ett problem har uppstått under tiden e-post sändes. Vänligen se över dina inställningar."
 
 #: admin/controller.php:99
 msgid "Email sent"
@@ -54,32 +55,32 @@ msgstr "E-post skickat"
 
 #: admin/controller.php:101
 msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "Du behöver ställa in din användares e-postadress före du kan skicka test e-post."
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
-msgstr ""
+msgstr "Sändningsläge"
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
-msgstr ""
+msgstr "Autentiseringsmetod"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Kan inte ladda listan från 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 "Fel vid autentisering"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr ""
+msgstr "Ditt fulla namn har ändrats"
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
@@ -135,38 +136,38 @@ msgstr "Kan inte radera användare från gruppen %s"
 msgid "Couldn't update app."
 msgstr "Kunde inte uppdatera appen."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Fel lösenord"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Ingen användare angiven"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen."
 
-#: 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 "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Kunde inte ändra lösenord"
 
 #: js/admin.js:73
 msgid "Sending..."
-msgstr ""
+msgstr "Skickar..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -174,7 +175,7 @@ msgstr "Användardokumentation"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Administratörsdokumentation"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -212,7 +213,7 @@ msgstr "Fel uppstod vid uppdatering av appen"
 msgid "Error"
 msgstr "Fel"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Uppdatera"
 
@@ -220,31 +221,31 @@ msgstr "Uppdatera"
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Välj en profilbild"
 
 #: js/personal.js:274
 msgid "Very weak password"
-msgstr ""
+msgstr "Väldigt svagt lösenord"
 
 #: js/personal.js:275
 msgid "Weak password"
-msgstr ""
+msgstr "Svagt lösenord"
 
 #: js/personal.js:276
 msgid "So-so password"
-msgstr ""
+msgstr "Okej lösenord"
 
 #: js/personal.js:277
 msgid "Good password"
-msgstr ""
+msgstr "Bra lösenord"
 
 #: js/personal.js:278
 msgid "Strong password"
-msgstr ""
+msgstr "Starkt lösenord"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund."
 
@@ -293,29 +294,29 @@ msgstr "Ett giltigt lösenord måste anges"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Varning: Hem katalogen för varje användare \"{användare}\" finns redan"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
 #: templates/admin.php:8
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
+msgstr "Allting (allvarliga fel, fel, varningar, info, debug)"
 
 #: templates/admin.php:9
 msgid "Info, warnings, errors and fatal issues"
-msgstr ""
+msgstr "Info, varningar och allvarliga fel"
 
 #: templates/admin.php:10
 msgid "Warnings, errors and fatal issues"
-msgstr ""
+msgstr "Varningar, fel ocg allvarliga fel"
 
 #: templates/admin.php:11
 msgid "Errors and fatal issues"
-msgstr ""
+msgstr "Fel och allvarliga fel"
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
-msgstr ""
+msgstr "Endast allvarliga fel"
 
 #: templates/admin.php:16 templates/admin.php:23
 msgid "None"
@@ -327,32 +328,32 @@ msgstr "Logga in"
 
 #: templates/admin.php:18
 msgid "Plain"
-msgstr ""
+msgstr "Enkel"
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "NT LAN Manager"
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Säkerhetsvarning"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
-msgstr ""
+msgstr "Du ansluter till %s via HTTP. Vi rekommenderar starkt att du konfigurerar din server att använda HTTPS istället."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -361,68 +362,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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Installationsvarning"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: templates/admin.php:75
+#: 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:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen \"fileinfo\" saknas"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr ""
+msgstr "Din PHP version är föråldrad"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
-msgstr ""
+msgstr "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt."
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale fungerar inte"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
-msgstr ""
+msgstr "Systemspråk kan inte ställas in till ett som stödjer UTF-8."
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
-msgstr ""
+msgstr "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn."
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
-msgstr ""
+msgstr "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s."
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internetförbindelsen fungerar inte"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -431,162 +432,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:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Sista cron kördes vid %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 "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron kördes inte ännu!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Exekvera en uppgift vid varje sidladdning"
 
-#: templates/admin.php:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Dela"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktivera delat API"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Tillåt applikationer att använda delat API"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Tillåt länkar"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Tillåt offentlig uppladdning"
 
-#: templates/admin.php:208
+#: 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:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Tillåt vidaredelning"
 
-#: templates/admin.php:217
+#: 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:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Tillåt delning med alla"
 
-#: templates/admin.php:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Tillåt e-post notifikation"
 
-#: templates/admin.php:235
+#: 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:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Säkerhet"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Kräv HTTPS"
 
-#: templates/admin.php:257
+#: 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:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
-msgstr ""
+msgstr "E-postserver"
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "Detta används för att skicka ut notifieringar."
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
-msgstr ""
+msgstr "Från adress"
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
-msgstr ""
+msgstr "Autentisering krävs"
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Serveradress"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Inloggningsuppgifter"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP användarnamn"
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP lösenord"
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
-msgstr ""
+msgstr "Testa e-post inställninggar"
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
-msgstr ""
+msgstr "Skicka e-post"
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivå på loggning"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -604,23 +621,23 @@ msgstr "Lägg till din applikation"
 msgid "More Apps"
 msgstr "Fler Appar"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Välj en App"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "Dokumentation:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Se programsida på apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
-msgstr ""
+msgstr "Se applikationens webbplats"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>"
 
@@ -657,108 +674,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Ditt lösenord har ändrats"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Kunde inte ändra ditt lösenord"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Hela namnet"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
-msgstr ""
+msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar"
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profilbild"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Ladda upp ny"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Välj ny från filer"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Radera bild"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
-msgstr ""
+msgstr "Din avatar tillhandahålls av ditt ursprungliga konto."
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Välj som profilbild"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Hjälp att översätta"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
+msgstr "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer"
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Inloggningslösenord"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Dekryptera alla filer"
 
@@ -786,7 +803,7 @@ msgstr "Förvald lagring"
 
 #: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
+msgstr "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")"
 
 #: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index d06794d6eee..dc65893d02e 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AsavarTzeth <asavartzeth@gmail.com>, 2014
 # DanielMalmgren <daniel@kolefors.se>, 2013
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
 # Jan Busk, 2013
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 17:30+0000\n"
+"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,7 +172,7 @@ msgstr "Hjälp"
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
 msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+msgstr "Grupper som uppfyller dessa kriterier finns i %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -207,7 +208,7 @@ msgstr "grupper hittade"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Användare loggar in med detta attribut:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -275,7 +276,7 @@ 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 %s access to users meeting these criteria:"
-msgstr ""
+msgstr "Begränsa %s tillgång till användare som uppfyller dessa kriterier:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -419,49 +420,60 @@ msgstr "Attribut för gruppmedlemmar"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+msgstr "Undergrupper"
 
 #: templates/settings.php:39
 msgid ""
 "When switched on, groups that contain groups are supported. (Only works if "
 "the group member attribute contains DNs.)"
-msgstr ""
+msgstr "När den är påslagen, stöds grupper som innehåller grupper. (Fungerar endast om gruppmedlemmens attribut innehåller DNs.)"
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Paging klusterstorlek"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Klusterstorlek som används för paged LDAP sökningar som kan komma att returnera skrymmande resultat som uppräknande av användare eller grupper. (Inställning av denna till 0 inaktiverar paged LDAP sökningar i de situationerna)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Specialattribut"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kvotfält"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Datakvot standard"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-postfält"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Namnregel för hemkatalog"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Internt Användarnamn"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -477,15 +489,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Internt Användarnamn Attribut:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "Åsidosätt UUID detektion"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -496,19 +508,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "UUID Attribut för Användare:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "UUID Attribut för Grupper:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Användarnamn-LDAP User Mapping"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -522,10 +534,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Rensa Användarnamn-LDAP User Mapping"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 0cd2466a5d4..4670128c670 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 7686df53f06..e98284e51f3 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: sw_KE\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index 49157af4bc5..aa643c7a408 100644
--- a/l10n/sw_KE/files_external.po
+++ b/l10n/sw_KE/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 09812f7f63a..b607d2dedb0 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 8a372c5b480..2703facb88a 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 578d7e4aa09..3dffd9f58ac 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 911c3f1670b..9ac011d35d1 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr "கார்த்திகை"
 msgid "December"
 msgstr "மார்கழி"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "சேமிக்கப்படுகிறது..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "இரத்து செய்க"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr "பகிர்வு"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "வழு"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "பகிரும் போதான வழு"
 
@@ -416,19 +415,19 @@ msgstr "கடவுச்சொல் பாதுகாக்கப்பட�
 msgid "Error unsetting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
@@ -542,6 +541,18 @@ 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 "தனிப்பட்ட"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index fc33ea09f3c..6c806272a49 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "எந்த கோப்பும் பதிவேற்றப்படவில்லை"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "வட்டில் எழுத முடியவில்லை"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "பகிர்வு"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "வழு"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "முன் செயல் நீக்கம் "
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
@@ -308,113 +300,109 @@ msgstr "மாற்றப்பட்டது"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "பதிவேற்றுக"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "கோப்பு கையாளுதல்"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு "
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "ஆகக் கூடியது:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "பல்வேறுப்பட்ட கோப்பு மற்றும் கோப்புறைகளை பதிவிறக்க தேவையானது."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP பதிவிறக்கலை இயலுமைப்படுத்துக"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 ஆனது எல்லையற்றது"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடிய உள்ளீட்டு அளவு"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "சேமிக்க "
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "புதிய"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "கோப்பு உரை"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "கோப்புறை"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "இணைப்பிலிருந்து"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "பதிவேற்றலை இரத்து செய்க"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "பதிவேற்றல் மிகப்பெரியது"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index a11995dfd60..d0f415fd5c5 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "தயவுசெய்து ஒரு செல்லுபடிய�
 msgid "Error configuring Google Drive storage"
 msgstr "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "வெளி சேமிப்பு"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "கோப்புறை பெயர்"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "தகவமைப்பு"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "தெரிவுகள்"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "பயன்படத்தக்க"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "தொகுப்பில்லா"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "பயனாளர்கள் எல்லாம்"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "குழுக்கள்"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "பயனாளர்"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL வேர் சான்றிதழ்கள்"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "வேர் சான்றிதழை இறக்குமதி செய்க"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index fbe3d5f915b..96e0bc2c2a1 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "கோப்புகளுக்கு செல்க"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "வீ சொலிக் கோப்புகளை உருவாக்குவதற்கு தெரிவுசெய்யப்பட்ட கோப்புகள் மிகப்பெரியவை"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "கடந்த வருடம்"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index a7d57176b6d..aec5ad9de2f 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "மறைக்குறியீடு"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "இற்றைப்படுத்தல்"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "பாதுகாப்பு எச்சரிக்கை"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "சேவையக முகவரி"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "துறை "
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "சான்று ஆவணங்கள்"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "மேலதிக"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "குறைவான"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 8ff5e0b32ac..4e168a7dcc4 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "bytes களில் "
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/te/core.po b/l10n/te/core.po
index dffce6310c9..01416c7db55 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,63 +135,63 @@ msgstr "నవంబర్"
 msgid "December"
 msgstr "డిసెంబర్"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "క్షణాల క్రితం"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n నిమిషం క్రితం"
 msgstr[1] "%n నిమిషాల క్రితం"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n గంట క్రితం"
 msgstr[1] "%n గంటల క్రితం"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "ఈరోజు"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n రోజు క్రితం"
 msgstr[1] "%n రోజుల క్రితం"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n నెల క్రితం"
 msgstr[1] "%n నెలల క్రితం"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "నెలల క్రితం"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
@@ -239,32 +230,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "కొనసాగించు"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -297,11 +296,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -417,19 +416,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "హెచ్చరిక"
 
@@ -543,6 +542,18 @@ 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 "వ్యక్తిగతం"
diff --git a/l10n/te/files.po b/l10n/te/files.po
index e2845bb8c9d..97c2ad4d8dd 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "శాశ్వతంగా తొలగించు"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "పొరపాటు"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "భద్రపరచు"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "కొత్త సంచయం"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "సంచయం"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 80198b35247..90e1578bd18 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "సంచయం పేరు"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "వాడుకరులు"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index f1cbfbcfc20..9428875f4e6 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr "పోయిన సంవత్సరం"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 5d2c6323c8e..b8c07e59ad2 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "సేవకి చిరునామా"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "మరిన్ని"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index e728d77914a..515b88f3503 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 4ed00c9fc1c..5c36d44feb1 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-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,36 +18,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -144,127 +135,135 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1099
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1100
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1101
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1102
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1103
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1104
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1105
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1106
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1107
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1108
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1109
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:125
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146
+#: js/oc-dialogs.js:151
 msgid "Error loading file picker template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:177
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:182
+#: js/oc-dialogs.js:187
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:199
+#: js/oc-dialogs.js:204
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:219
+#: js/oc-dialogs.js:224
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:347
+#: js/oc-dialogs.js:352
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:361
+#: js/oc-dialogs.js:366
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:367
+#: js/oc-dialogs.js:372
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:373
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:375
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:376
 msgid ""
 "If you select both versions, the copied file will have a number added to its "
 "name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:384
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:394
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:457
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:465
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,12 +295,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:787
 msgid "Error while sharing"
 msgstr ""
 
@@ -365,71 +364,71 @@ msgstr ""
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:363
+#: js/share.js:324 js/share.js:383
 msgid "group"
 msgstr ""
 
-#: js/share.js:335
+#: js/share.js:355
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:379
+#: js/share.js:399
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:421
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:409
+#: js/share.js:429
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:412
+#: js/share.js:432
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:414
+#: js/share.js:434
 msgid "access control"
 msgstr ""
 
-#: js/share.js:417
+#: js/share.js:437
 msgid "create"
 msgstr ""
 
-#: js/share.js:420
+#: js/share.js:440
 msgid "update"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:443
 msgid "delete"
 msgstr ""
 
-#: js/share.js:426
+#: js/share.js:446
 msgid "share"
 msgstr ""
 
-#: js/share.js:698
+#: js/share.js:718
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:711
+#: js/share.js:731
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:749
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:774
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:785
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:809
 msgid "Warning"
 msgstr ""
 
@@ -543,6 +542,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 ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 9aa0ab9820b..97d8aaf0ab0 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-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,47 +18,47 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:587
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:251 js/filelist.js:1101
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:614
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:777
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:802 js/filelist.js:879 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:803 js/filelist.js:880 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:810
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1040 js/filelist.js:1078
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -277,29 +277,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -307,113 +299,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 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 d93fbf74b5e..09f5900a03a 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-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"
@@ -109,91 +109,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 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
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 13b11589d37..446829a7066 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of "
+"%s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please "
+"ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 20282edb4f3..335843470ba 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 072aabb5c7f..9800a9ad3f7 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-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"
@@ -27,38 +27,38 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: js/filelist.js:3
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/trash.js:33 js/trash.js:124 js/trash.js:173
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:853 lib/trashbin.php:855
+#: js/trash.js:264
+msgid "Deleted Files"
+msgstr ""
+
+#: lib/trashbin.php:859 lib/trashbin.php:861
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:7
+#: templates/index.php:6
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:19
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
+#: templates/index.php:22 templates/index.php:24
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:31
+#: templates/index.php:30
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:33 templates/index.php:34
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 979e5d1aaa3..eca1e25e0df 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-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:87
+#: js/versions.js:88
 msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:125
+#: js/versions.js:126
 msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:155
+#: js/versions.js:156
 msgid "Restore"
 msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index d12067e9690..df8dcaa8041 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,23 +66,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -268,19 +268,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -337,3 +337,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index caf31020691..c7c39e54af5 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,23 +66,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:231
+#: files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:232
+#: files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:233 files.php:261
+#: files.php:234 files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: files.php:259
+#: files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -261,18 +261,18 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: 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:199
+#: setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: share/mailnotifications.php:73 share/mailnotifications.php:119
+#: share/mailnotifications.php:72 share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,3 +329,21 @@ msgstr ""
 #: template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8e957cdf9b1..9095c16f9f7 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:282
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:295 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:319
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -64,7 +64,7 @@ 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 ""
 
@@ -126,31 +126,31 @@ 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 ""
 
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr ""
 
@@ -210,31 +210,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:246
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:274
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:275
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:279
+#: js/personal.js:276
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:280
+#: js/personal.js:277
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:281
+#: js/personal.js:278
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:316
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -283,7 +283,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr ""
 
@@ -426,156 +426,172 @@ 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:175
+#: 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:183
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:210
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:218
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:219
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:226
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:237
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:259
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:265
+#: 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:277
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:310
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:332
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:336
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:340
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:346
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:349
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:353
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:354
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:359
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:360
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:392
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:399 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:403 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -592,23 +608,23 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid ""
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
@@ -646,108 +662,108 @@ msgstr ""
 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
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 9edf577b824..9418a90de14 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-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"
@@ -145,7 +145,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:963
+#: lib/wizard.php:983
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -419,40 +419,51 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -468,15 +479,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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,19 +498,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -513,10 +524,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 0575f3413a5..e858ef7740c 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"POT-Creation-Date: 2014-04-11 01:54-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,15 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "WebDAV Authentication"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "Address: "
 msgstr ""
 
-#: templates/settings.php:7
+#: templates/settings.php:6
 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 "
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index f92dd54ba45..3ff654362be 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr "พฤศจิกายน"
 msgid "December"
 msgstr "ธันวาคม"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "กำลังบันทึกข้อมูล..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "เดือน ที่ผ่านมา"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "ไฟล์ใหม่"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr "แชร์"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
 
@@ -411,19 +410,19 @@ msgstr "ใส่รหัสผ่านไว้"
 msgid "Error unsetting expiration date"
 msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "กำลังส่ง..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "ส่งอีเมล์แล้ว"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "คำเตือน"
 
@@ -537,6 +536,18 @@ 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 "ส่วนตัว"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 9f6d9d7744c..3c11a5cfddd 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "ชื่อไฟล์ไม่สามารถเว้นว่างได้"
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้"
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "แชร์"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "เลิกทำ"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
@@ -305,113 +297,109 @@ msgstr "แก้ไขแล้ว"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "อัพโหลด"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "การจัดกาไฟล์"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "ขนาดไฟล์สูงสุดที่อัพโหลดได้"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "จำนวนสูงสุดที่สามารถทำได้: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "จำเป็นต้องใช้สำหรับการดาวน์โหลดไฟล์พร้อมกันหลายๆไฟล์หรือดาวน์โหลดทั้งโฟลเดอร์"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "อนุญาตให้ดาวน์โหลดเป็นไฟล์ ZIP ได้"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 หมายถึงไม่จำกัด"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ขนาดไฟล์ ZIP สูงสุด"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "บันทึก"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "อัพโหลดไฟล์ใหม่"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "ไฟล์ข้อความ"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "โฟลเดอร์ใหม่"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "แฟ้มเอกสาร"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "จากลิงก์"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 52bb6ec1dcd..5a4178fb5c8 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "กรุณากรอกรหัส app key ของ Dropbox แล
 msgid "Error configuring Google Drive storage"
 msgstr "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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 เพื่อแชร์ข้อมูลไม่สามารถกระทำได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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 เพื่อแชร์ข้อมูลไม่สามารถดำเนินการได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง"
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "พื้นทีจัดเก็บข้อมูลจากภายนอก"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "ชื่อโฟลเดอร์"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "การกำหนดค่า"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "ตัวเลือก"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "สามารถใช้งานได้"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "ยังไม่มีการกำหนด"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "ผู้ใช้งานทั้งหมด"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 2257d7e995f..fcd4bbd24b9 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "กลับไปที่ไฟล์"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr "ปีที่แล้ว"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 96525b8f26e..050e1588f9d 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr "ส่งอีเมล์แล้ว"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "การเข้ารหัส"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr "อัพเดท"
 msgid "Updated"
 msgstr "อัพเดทแล้ว"
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "คำเตือนเกี่ยวกับความปลอดภัย"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "การแชร์ข้อมูล"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "อนุญาตให้ใช้งานลิงก์ได้"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "ที่อยู่เซิร์ฟเวอร์"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "พอร์ต"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "ข้อมูลส่วนตัวสำหรับเข้าระบบ"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "ระดับการเก็บบันทึก log"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "มาก"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "น้อย"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 9b08c612be8..1dd27e0b070 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "คุณลักษณะพิเศษ"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "ในหน่วยไบต์"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 39d504da9f0..cc1c42a783f 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-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-11 00:20+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,36 +21,27 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Son kullanma tarihi geçmişte."
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Şu kullanıcılara posta gönderilemedi: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Bakım kipi etkinleştirildi"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Bakım kipi kapatıldı"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 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"
@@ -147,127 +138,135 @@ msgstr "Kasım"
 msgid "December"
 msgstr "Aralık"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
-#: js/js.js:995
+#: js/js.js:1099
 msgid "seconds ago"
-msgstr "saniye önce"
+msgstr "saniyeler önce"
 
-#: js/js.js:996
+#: js/js.js:1100
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n dakika önce"
 msgstr[1] "%n dakika önce"
 
-#: js/js.js:997
+#: js/js.js:1101
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n saat önce"
 msgstr[1] "%n saat önce"
 
-#: js/js.js:998
+#: js/js.js:1102
 msgid "today"
 msgstr "bugün"
 
-#: js/js.js:999
+#: js/js.js:1103
 msgid "yesterday"
 msgstr "dün"
 
-#: js/js.js:1000
+#: js/js.js:1104
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n gün önce"
 msgstr[1] "%n gün önce"
 
-#: js/js.js:1001
+#: js/js.js:1105
 msgid "last month"
 msgstr "geçen ay"
 
-#: js/js.js:1002
+#: js/js.js:1106
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n ay önce"
 msgstr[1] "%n ay önce"
 
-#: js/js.js:1003
+#: js/js.js:1107
 msgid "months ago"
 msgstr "ay önce"
 
-#: js/js.js:1004
+#: js/js.js:1108
 msgid "last year"
 msgstr "geçen yıl"
 
-#: js/js.js:1005
+#: js/js.js:1109
 msgid "years ago"
 msgstr "yıl önce"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:125
 msgid "Choose"
-msgstr "seç"
+msgstr "Seç"
 
-#: js/oc-dialogs.js:146
+#: js/oc-dialogs.js:151
 msgid "Error loading file picker template: {error}"
 msgstr "Dosya seçici şablonu yüklenirken hata: {error}"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:177
 msgid "Yes"
 msgstr "Evet"
 
-#: js/oc-dialogs.js:182
+#: js/oc-dialogs.js:187
 msgid "No"
 msgstr "Hayır"
 
-#: js/oc-dialogs.js:199
+#: js/oc-dialogs.js:204
 msgid "Ok"
 msgstr "Tamam"
 
-#: js/oc-dialogs.js:219
+#: js/oc-dialogs.js:224
 msgid "Error loading message template: {error}"
 msgstr "İleti şablonu yüklenirken hata: {error}"
 
-#: js/oc-dialogs.js:347
+#: js/oc-dialogs.js:352
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} dosya çakışması"
 msgstr[1] "{count} dosya çakışması"
 
-#: js/oc-dialogs.js:361
+#: js/oc-dialogs.js:366
 msgid "One file conflict"
 msgstr "Bir dosya çakışması"
 
-#: js/oc-dialogs.js:367
+#: js/oc-dialogs.js:372
+msgid "New Files"
+msgstr "Yeni Dosyalar"
+
+#: js/oc-dialogs.js:373
+msgid "Already existing files"
+msgstr "Zaten mevcut olan dosyalar"
+
+#: js/oc-dialogs.js:375
 msgid "Which files do you want to keep?"
 msgstr "Hangi dosyaları saklamak istiyorsunuz?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:376
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr "Eğer iki sürümü de seçerseniz, kopyalanan dosya ismine eklenmiş bir sayı içerecektir."
+msgstr "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:384
 msgid "Cancel"
 msgstr "İptal"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:394
 msgid "Continue"
 msgstr "Devam et"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
 msgid "(all selected)"
 msgstr "(tümü seçildi)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:457
 msgid "({count} selected)"
 msgstr "({count} seçildi)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:465
 msgid "Error loading file exists template"
 msgstr "Dosya mevcut şablonu yüklenirken hata"
 
@@ -299,14 +298,14 @@ msgstr "Paylaşılan"
 msgid "Share"
 msgstr "Paylaş"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Hata"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:787
 msgid "Error while sharing"
-msgstr "Paylaşım sırasında hata  "
+msgstr "Paylaşım sırasında hata"
 
 #: js/share.js:171
 msgid "Error while unsharing"
@@ -368,71 +367,71 @@ msgstr "E-posta ile paylaş"
 msgid "No people found"
 msgstr "Kişi bulunamadı"
 
-#: js/share.js:324 js/share.js:363
+#: js/share.js:324 js/share.js:383
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:335
+#: js/share.js:355
 msgid "Resharing is not allowed"
 msgstr "Tekrar paylaşmaya izin verilmiyor"
 
-#: js/share.js:379
+#: js/share.js:399
 msgid "Shared in {item} with {user}"
 msgstr "{item} içinde {user} ile paylaşılanlar"
 
-#: js/share.js:401
+#: js/share.js:421
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: js/share.js:409
+#: js/share.js:429
 msgid "notify by email"
 msgstr "e-posta ile bildir"
 
-#: js/share.js:412
+#: js/share.js:432
 msgid "can edit"
 msgstr "düzenleyebilir"
 
-#: js/share.js:414
+#: js/share.js:434
 msgid "access control"
 msgstr "erişim kontrolü"
 
-#: js/share.js:417
+#: js/share.js:437
 msgid "create"
 msgstr "oluştur"
 
-#: js/share.js:420
+#: js/share.js:440
 msgid "update"
 msgstr "güncelle"
 
-#: js/share.js:423
+#: js/share.js:443
 msgid "delete"
 msgstr "sil"
 
-#: js/share.js:426
+#: js/share.js:446
 msgid "share"
 msgstr "paylaş"
 
-#: js/share.js:698
+#: js/share.js:718
 msgid "Password protected"
 msgstr "Parola korumalı"
 
-#: js/share.js:711
+#: js/share.js:731
 msgid "Error unsetting expiration date"
 msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
 
-#: js/share.js:723
+#: js/share.js:749
 msgid "Error setting expiration date"
 msgstr "Geçerlilik tarihi tanımlama hatası"
 
-#: js/share.js:742
+#: js/share.js:774
 msgid "Sending ..."
 msgstr "Gönderiliyor..."
 
-#: js/share.js:753
+#: js/share.js:785
 msgid "Email sent"
 msgstr "E-posta gönderildi"
 
-#: js/share.js:777
+#: js/share.js:809
 msgid "Warning"
 msgstr "Uyarı"
 
@@ -499,7 +498,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?"
@@ -546,6 +545,18 @@ msgstr "Yeni parola"
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
+#: 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 desteklenmemediğinden %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!"
+
+#: setup/controller.php:144
+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"
@@ -706,7 +717,7 @@ msgstr "Kurulumu tamamla"
 
 #: templates/installation.php:150
 msgid "Finishing …"
-msgstr "Tamamlanıyor .."
+msgstr "Tamamlanıyor ..."
 
 #: templates/layout.user.php:40
 msgid ""
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 70fb73bdcca..18b271aa1a2 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-04-06 01:55-0400\n"
+"PO-Revision-Date: 2014-04-05 14:30+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,48 +21,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Dosya adı boş olamaz."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr "'%s' geçersiz bir dosya adı."
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
 msgstr "Hedef klasör taşındı veya silindi."
 
-#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Geçerli bir kaynak değil"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -72,74 +72,74 @@ msgstr "Sunucunun adresleri açma izi yok, lütfen sunucu yapılandırmasını d
 msgid "Error while downloading %s to %s"
 msgstr "%s, %s içine indirilirken hata"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Klasör oluşturulurken hata"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Yükleme dizini tanımlanamadı."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Geçersiz Simge"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dosya kısmen karşıya yüklenebildi"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Hiç dosya gönderilmedi"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Geçici dizin eksik"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Yeterli disk alanı yok"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Yükleme başarısız. Yüklenen dosya bulunamadı"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "Yükleme başarısız. Dosya bilgisi alınamadı."
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
@@ -153,99 +153,99 @@ msgstr "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi"
 
 #: 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"
+msgstr "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor"
 
 #: 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:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Sunucudan sonuç alınamadı."
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL boş olamaz"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 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:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Dosya oluşturulamadı"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Klasör oluşturulamadı"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "Adres getirilirken hata"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Paylaş"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Kalıcı olarak sil"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "İsim değiştir."
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Dosya taşıma hatası"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Hata"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Dosya adlandırılamadı"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} ismi {old_name} ile değiştirildi"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "geri al"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Dosya silinirken hata."
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dizin"
 msgstr[1] "%n dizin"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosya"
 msgstr[1] "%n dosya"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} ve {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n dosya yükleniyor"
@@ -282,143 +282,131 @@ msgid ""
 "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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Dosya taşıma hatası"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Hata"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "İsim"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Değiştirilme"
 
 #: lib/app.php:60
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr "Geçersiz dizin adı. 'Shared' ismi ayrılmıştır."
+msgstr "Geçersiz klasör adı. 'Shared' ismi ayrılmıştır."
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s yeniden adlandırılamadı"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Yükle"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Dosya işlemleri"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Maksimum yükleme boyutu"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "mümkün olan en fazla: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Çoklu dosya ve dizin indirmesi için gerekli."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "ZIP indirmeyi etkinleştir"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 limitsiz demektir"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP dosyaları için en fazla girdi boyutu"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Yeni"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "Yeni metin dosyası"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Metin dosyası"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Yeni klasör"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Klasör"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Bağlantıdan"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Silinmiş dosyalar"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/index.php:52
+#: templates/index.php:51
 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:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiçbir şey yok. Bir şeyler yükleyin!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Yükleme çok büyük"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/tr/files_external.po
index 0a942596ce8..02bf5aab5fe 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 20:50+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"
@@ -38,91 +38,100 @@ msgstr "Lütfen Dropbox app key ve secret temin ediniz"
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive depo yapılandırma hatası"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr "Kaydedildi"
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr "<b>Not:</b> "
+
+#: lib/config.php:602
+msgid " and "
+msgstr "ve"
+
+#: lib/config.php:624
+#, php-format
 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."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin."
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin."
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin."
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Harici Depolama"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
-msgstr "Dizin ismi"
+msgstr "Klasör ismi"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Harici depolama"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Seçenekler"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Uygulanabilir"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr "Kullanabilenler"
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Depo ekle"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Hiçbiri"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr "Kullanıcı veya grup yok"
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Tüm Kullanıcılar"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Gruplar"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Kullanıcılar için Harici Depolamayı Etkinleştir"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 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:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL kök sertifikaları"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Kök Sertifikalarını İçe Aktar"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 7ac32596ae6..d4f9948df31 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # tridinebandim, 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: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-15 05:40+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-11 01:54-0400\n"
+"PO-Revision-Date: 2014-04-10 16:50+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,40 +27,40 @@ msgstr "%s alıcı olarak silinemedi"
 #: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
-msgstr "%s eri yüklenemedi"
+msgstr "%s geri yüklenemedi"
 
-#: js/filelist.js:23
+#: js/filelist.js:3
 msgid "Deleted files"
 msgstr "Silinmiş dosyalar"
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/trash.js:33 js/trash.js:124 js/trash.js:173
 msgid "Error"
 msgstr "Hata"
 
-#: lib/trashbin.php:853 lib/trashbin.php:855
+#: js/trash.js:264
+msgid "Deleted Files"
+msgstr "Silinen Dosyalar"
+
+#: lib/trashbin.php:859 lib/trashbin.php:861
 msgid "restored"
 msgstr "geri yüklendi"
 
-#: templates/index.php:7
+#: templates/index.php:6
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!"
 
-#: templates/index.php:20
+#: templates/index.php:19
 msgid "Name"
 msgstr "İsim"
 
-#: templates/index.php:23 templates/index.php:25
+#: templates/index.php:22 templates/index.php:24
 msgid "Restore"
 msgstr "Geri yükle"
 
-#: templates/index.php:31
+#: templates/index.php:30
 msgid "Deleted"
 msgstr "Silindi"
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:33 templates/index.php:34
 msgid "Delete"
 msgstr "Sil"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr "Silinen Dosyalar"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index d54faf7b569..f067d809632 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-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 21:00+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"
@@ -69,23 +69,23 @@ msgstr "Geçersiz resim"
 msgid "web services under your control"
 msgstr "kontrolünüzün altındaki web hizmetleri"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP indirmeleri kapatıldı."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Dosyaların birer birer indirilmesi gerekmektedir."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Dosyalara dön"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyük."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -271,19 +271,19 @@ msgstr "Bir adi kullanici vermek. "
 msgid "Set an admin password."
 msgstr "Parola yonetici birlemek. "
 
-#: private/setup.php:198
+#: 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 "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
+msgstr "Web sunucunuz dosya aktarımı için düzgün bir şekilde yapılandırılmamış. WevDAV arayüzü sorunlu görünüyor."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, 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/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s sizinle »%s« paylaşımında bulundu"
@@ -295,7 +295,7 @@ msgstr "\"%s\" kategorisi bulunamadı"
 
 #: private/template/functions.php:133
 msgid "seconds ago"
-msgstr "saniye önce"
+msgstr "saniyeler önce"
 
 #: private/template/functions.php:134
 msgid "%n minute ago"
@@ -340,3 +340,21 @@ msgstr "geçen yıl"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "yıl önce"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-\""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Geçerli bir parola mutlaka sağlanmalı"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr "Bu kullanıcı adı zaten kullanımda"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 37e17b1006a..3f8e26a01f5 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-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -51,15 +51,15 @@ msgstr "E-posta gönderildi"
 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:284
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr "Gönderme kipi"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Şifreleme"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr "Kimlik doğrulama yöntemi"
 
@@ -68,7 +68,7 @@ msgid "Unable to load list from App Store"
 msgstr "App Store'dan liste yüklenemiyor"
 
 #: 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 "Kimlik doğrulama hatası"
 
@@ -130,32 +130,32 @@ msgstr "%s grubundan kullanıcı kaldırılamıyor"
 msgid "Couldn't update app."
 msgstr "Uygulama güncellenemedi."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Hatalı parola"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Kullanıcı girilmedi"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Lütfen bir yönetici kurtarma parolası girin, aksi takdirde tüm kullanıcı verisi kaybedilecek"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin."
 
-#: 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 "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Parola değiştirilemiyor"
 
@@ -207,7 +207,7 @@ msgstr "Uygulama güncellenirken hata"
 msgid "Error"
 msgstr "Hata"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Güncelleme"
 
@@ -215,7 +215,7 @@ msgstr "Güncelleme"
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "Bir profil fotoğrafı seçin"
 
@@ -239,7 +239,7 @@ msgstr "İyi parola"
 msgid "Strong password"
 msgstr "Güçlü parola"
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir."
 
@@ -288,7 +288,7 @@ msgstr "Geçerli bir parola mutlaka sağlanmalı"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Türkçe"
 
@@ -354,7 +354,7 @@ msgid ""
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .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."
+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 belge kök dizini dışına almanızı şiddetle tavsiye ederiz."
 
 #: templates/admin.php:75
 msgid "Setup Warning"
@@ -364,7 +364,7 @@ msgstr "Kurulum Uyarısı"
 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."
+msgstr "Web sunucunuz dosya aktarımı için düzgün bir şekilde yapılandırılmamış. WevDAV arayüzü sorunlu görünüyor."
 
 #: templates/admin.php:79
 #, php-format
@@ -431,157 +431,173 @@ msgid "Cron"
 msgstr "Cron"
 
 #: 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:175
+#: 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:183
+#: 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:188
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Paylaşım"
 
-#: templates/admin.php:194
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Paylaşım API'sini etkinleştir"
 
-#: templates/admin.php:195
+#: 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:202
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Bağlantılara izin ver"
 
-#: templates/admin.php:203
+#: 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:211
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Herkes tarafından yüklemeye izin ver"
 
-#: templates/admin.php:212
+#: 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:220
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Paylaşıma izin ver"
 
-#: templates/admin.php:221
+#: 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:228
+#: 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:231
+#: 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:238
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Posta bilgilendirmesine izin ver"
 
-#: templates/admin.php:239
+#: 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:246
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Güvenlik"
 
-#: templates/admin.php:259
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS bağlantısına zorla"
 
-#: templates/admin.php:261
+#: 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:267
+#: 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."
+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:279
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr "E-Posta Sunucusu"
 
-#: templates/admin.php:281
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr "Bu, bildirimler gönderilirken kullanılır."
 
-#: templates/admin.php:312
+#: templates/admin.php:327
 msgid "From address"
 msgstr "Kimden adresi"
 
-#: templates/admin.php:334
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr "Kimlik doğrulama gerekli"
 
-#: templates/admin.php:338
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Sunucu adresi"
 
-#: templates/admin.php:342
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:347
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Kimlik Bilgileri"
 
-#: templates/admin.php:348
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr "SMTP Kullanıcı Adı"
 
-#: templates/admin.php:351
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr "SMTP Parolası"
 
-#: templates/admin.php:355
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr "E-posta ayarlarını sına"
 
-#: templates/admin.php:356
+#: templates/admin.php:371
 msgid "Send email"
 msgstr "E-posta gönder"
 
-#: templates/admin.php:361
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:362
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Günlük seviyesi"
 
-#: templates/admin.php:394
+#: templates/admin.php:409
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:395
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Az"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -599,23 +615,23 @@ msgstr "Uygulamanızı Ekleyin"
 msgid "More Apps"
 msgstr "Daha Fazla Uygulama"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Bir Uygulama Seçin"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr "Belgelendirme:"
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın "
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr "Uygulama web sitesine bakın"
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>"
 
@@ -652,108 +668,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Parola"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Şifreniz değiştirildi"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Parolanız değiştirilemiyor"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Mevcut parola"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Yeni parola"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Parola değiştir"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "Tam Adı"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "E-posta adresiniz"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 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
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "Profil resmi"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "Yeni yükle"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "Dosyalardan seç"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "Resmi kaldır"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 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:107
+#: templates/personal.php:100
 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:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "İptal"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "Profil resmi olarak seç"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Çevirilere yardım edin"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 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:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "Oturum açma parolası"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "Tüm dosyaların şifresini çöz"
 
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 29c83ca6b78..612e836a609 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 23:30+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"
@@ -422,41 +422,52 @@ msgid ""
 "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
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr "Sayfalama yığın boyutu"
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr "Yığın boyutu, kullanıcı veya grup numaralandırması benzeri hantal sonuçlar döndürebilen sayfalandırılmış LDAP aramaları için kullanılır. (0 yapmak bu durumlarda sayfalandırılmış LDAP aramalarını devre dışı bırakır.)"
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Özel Öznitelikler"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Kota Alanı"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Öntanımlı Kota"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "byte cinsinden"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "E-posta Alanı"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Kullanıcı Ana Dizini İsimlendirme Kuralı"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "Dahili Kullanıcı Adı"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -472,15 +483,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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "Dahili Kullanıcı Adı Özniteliği:"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "UUID tespitinin üzerine yaz"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr "Kullanıcılar için UUID Özniteliği:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr "Gruplar için UUID Özniteliği:"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirme"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -517,10 +528,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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 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 c5ff6cc7c75..528cc7ed88b 100644
--- a/l10n/tzm/core.po
+++ b/l10n/tzm/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/tzm/files.po b/l10n/tzm/files.po
index 5ca9c96bb25..0e5165652ec 100644
--- a/l10n/tzm/files.po
+++ b/l10n/tzm/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 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 ""
 
-#: 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/tzm/files_external.po b/l10n/tzm/files_external.po
index 10b190ec86c..1720136d3fc 100644
--- a/l10n/tzm/files_external.po
+++ b/l10n/tzm/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/tzm/lib.po b/l10n/tzm/lib.po
index 365568ea673..70663f6f817 100644
--- a/l10n/tzm/lib.po
+++ b/l10n/tzm/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po
index 2829e52b25f..c8ed5177a5a 100644
--- a/l10n/tzm/settings.po
+++ b/l10n/tzm/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/tzm/user_ldap.po b/l10n/tzm/user_ldap.po
index f4b3363e222..33f053cd3f6 100644
--- a/l10n/tzm/user_ldap.po
+++ b/l10n/tzm/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 1cf9849312b..ca775aa5dc9 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr "ئوغلاق"
 msgid "December"
 msgstr "كۆنەك"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "ساقلاۋاتىدۇ…"
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "بۈگۈن"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "ۋاز كەچ"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr "ھەمبەھىر"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -411,19 +410,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "ئاگاھلاندۇرۇش"
 
@@ -537,6 +536,18 @@ 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 "شەخسىي"
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 2fd2b626aae..35888bf4d05 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "ھېچقانداق ھۆججەت يۈكلەنمىدى"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "ۋاقىتلىق قىسقۇچ كەم."
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "دىسكىغا يازالمىدى"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "يۈكلەشتىن ۋاز كەچتى."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} مەۋجۇت"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "مەڭگۈلۈك ئۆچۈر"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "ئات ئۆزگەرت"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "خاتالىق"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "كۈتۈۋاتىدۇ"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "چوڭلۇقى"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
@@ -305,113 +297,109 @@ msgstr "ئۆزگەرتكەن"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "يۈكلە"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "ساقلا"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "يېڭى"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "تېكىست ھۆججەت"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "يېڭى قىسقۇچ"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "قىسقۇچ"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "يۈكلەشتىن ۋاز كەچ"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "چۈشۈر"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "يۈكلەندىغىنى بەك چوڭ"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index f757592a12a..c200c63e02f 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "قىسقۇچ ئاتى"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "سىرتقى ساقلىغۇچ"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "سەپلىمە"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "تاللانما"
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "گۇرۇپپا"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "ئىشلەتكۈچىلەر"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index d3d58129f5c..49eec14adb2 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index da254c80a06..384a913c7f0 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -48,15 +48,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "شىفىرلاش"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -65,7 +65,7 @@ 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 "سالاھىيەت دەلىللەش خاتالىقى"
 
@@ -127,32 +127,32 @@ msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەل�
 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 ""
 
@@ -204,7 +204,7 @@ msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى"
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "يېڭىلا"
 
@@ -212,7 +212,7 @@ msgstr "يېڭىلا"
 msgid "Updated"
 msgstr "يېڭىلاندى"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "ئۇيغۇرچە"
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "بىخەتەرلىك ئاگاھلاندۇرۇش"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "ئاگاھلاندۇرۇش تەڭشەك"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "ھەمبەھىر"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "بىخەتەرلىك"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "مۇلازىمېتىر ئادرىسى"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "ئېغىز"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "خاتىرە"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "خاتىرە دەرىجىسى"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "ئاز"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "نەشرى"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "ئەپىڭىزنى قوشۇڭ"
 msgid "More Apps"
 msgstr "تېخىمۇ كۆپ ئەپلەر"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "بىر ئەپ تاللاڭ"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -649,108 +665,108 @@ msgstr ""
 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
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "ئىم"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "ئىمنى ئۆزگەرتكىلى بولمايدۇ."
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "نۆۋەتتىكى ئىم"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "يېڭى ئىم"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "ئىم ئۆزگەرت"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "تورخەت"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "تورخەت ئادرېسىڭىز"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "ۋاز كەچ"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "تىل"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "تەرجىمىگە ياردەم"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index a2672c92aaa..31a16bcc3d1 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 333afd63141..874216523c5 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -18,36 +18,27 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Неможливо надіслати пошту наступним користувачам: %s "
 
-#: 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 "... %d%% виконано ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Немає наданого зображення або файлу"
@@ -144,67 +135,67 @@ msgstr "Листопад"
 msgid "December"
 msgstr "Грудень"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Зберігаю..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n хвилину тому"
 msgstr[1] "%n хвилини тому"
 msgstr[2] "%n хвилин тому"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n годину тому"
 msgstr[1] "%n години тому"
 msgstr[2] "%n годин тому"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "сьогодні"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "вчора"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n день тому"
 msgstr[1] "%n дні тому"
 msgstr[2] "%n днів тому"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "минулого місяця"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n місяць тому"
 msgstr[1] "%n місяці тому"
 msgstr[2] "%n місяців тому"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "місяці тому"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "минулого року"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "роки тому"
 
@@ -244,32 +235,40 @@ msgid "One file conflict"
 msgstr "Один файловий конфлікт"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "Нових Файлів"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Які файли ви хочете залишити?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я."
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Продовжити"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(все вибрано)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} вибрано)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Помилка при завантаженні файлу існуючого шаблону"
 
@@ -302,11 +301,11 @@ msgid "Share"
 msgstr "Поділитися"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Помилка"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Помилка під час публікації"
 
@@ -422,19 +421,19 @@ msgstr "Захищено паролем"
 msgid "Error unsetting expiration date"
 msgstr "Помилка при відміні терміна дії"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Помилка при встановленні терміна дії"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Надсилання..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Ел. пошта надіслана"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Попередження"
 
@@ -548,6 +547,18 @@ 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 "Особисте"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index f71347e458e..5b0573fee74 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -18,48 +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/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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr " Ім'я файлу не може бути порожнім."
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -69,74 +69,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "Не вдалося встановити каталог завантаження."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "Не завантажено жодного файлу. Невідома помилка"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл успішно вивантажено без помилок."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: "
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл відвантажено лише частково"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Не відвантажено жодного файлу"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Відсутній тимчасовий каталог"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Невдалося записати на диск"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Місця більше немає"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Невірний каталог."
 
@@ -157,94 +157,94 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL не може бути порожнім"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Не вдалося створити файл"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Не вдалося створити теку"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Поділитися"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Видалити назавжди"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Помилка переміщення файлу"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Помилка"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "Неможливо перейменувати файл"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "замінено {new_name} на {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "відмінити"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n тека"
 msgstr[1] "%n тека"
 msgstr[2] "%n теки"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
 msgstr[1] "%n файлів"
 msgstr[2] "%n файли"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -282,29 +282,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Змінено"
 
@@ -312,113 +304,109 @@ msgstr "Змінено"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не може бути перейменований"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Вивантажити"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Робота з файлами"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Максимальний розмір відвантажень"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "макс.можливе:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Необхідно для мульти-файлового та каталогового завантаження."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Активувати ZIP-завантаження"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 є безліміт"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Максимальний розмір завантажуємого ZIP файлу"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Зберегти"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Створити"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Текстовий файл"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Нова тека"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Тека"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "З посилання"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "Видалено файлів"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Тут нічого немає. Відвантажте що-небудь!"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Файл занадто великий"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Файли скануються, зачекайте, будь-ласка."
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "Поточне сканування"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Оновлення кеша файлової системи..."
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 397ecc48c46..e176fae6bc9 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Будь ласка, надайте дійсний ключ та пар�
 msgid "Error configuring Google Drive storage"
 msgstr "Помилка при налаштуванні сховища Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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 тек неможливо. Попрохайте системного адміністратора встановити його."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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 тек неможливо. Попрохайте системного адміністратора встановити її."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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> Підтримка CURL в PHP не увімкнута чи не встановлена. Під'єднанатися OwnCloud / WebDav або Google Drive неможливе. Попрохайте системного адміністратора встановити її."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Зовнішні сховища"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Ім'я теки"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Зовнішнє сховище"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Налаштування"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Опції"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Придатний"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Додати сховище"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "Не встановлено"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Усі користувачі"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Користувачі"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Активувати користувацькі зовнішні сховища"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL корневі сертифікати"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Імпортувати корневі сертифікати"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index bba27052817..5724656194a 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -65,23 +65,23 @@ msgstr "Невірне зображення"
 msgid "web services under your control"
 msgstr "підконтрольні Вам веб-сервіси"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP завантаження вимкнено."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Файли повинні бути завантаженні послідовно."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Повернутися до файлів"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Вибрані фали завеликі для генерування zip файлу."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL ім'я користувача та/або пароль не дійсні: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вам потрібно ввести або існуючий обліковий запис або administrator."
 
@@ -206,9 +206,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Помилка БД: \"%s\""
@@ -217,9 +217,9 @@ msgstr "Помилка БД: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Команда, що викликала проблему: \"%s\""
@@ -255,7 +255,7 @@ msgstr "Oracle ім'я користувача та/або пароль не ді
 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 ім'я користувача та/або пароль не дійсні"
 
@@ -267,19 +267,19 @@ msgstr "Встановіть ім'я адміністратора."
 msgid "Set an admin password."
 msgstr "Встановіть пароль адміністратора."
 
-#: private/setup.php:198
+#: 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 "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s розподілено »%s« з тобою"
@@ -340,3 +340,21 @@ msgstr "минулого року"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "роки тому"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "Потрібно задати вірне ім'я користувача"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "Потрібно задати вірний пароль"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 5f9427f831c..5408c4789aa 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -48,15 +48,15 @@ msgstr "Ел. пошта надіслана"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "Шифрування"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Unable to load list from App Store"
 msgstr "Не вдалося завантажити список з 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 "Помилка автентифікації"
 
@@ -127,32 +127,32 @@ 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 ""
 
@@ -204,7 +204,7 @@ msgstr "Помилка при оновленні програми"
 msgid "Error"
 msgstr "Помилка"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "Оновити"
 
@@ -212,7 +212,7 @@ msgstr "Оновити"
 msgid "Updated"
 msgstr "Оновлено"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr "Потрібно задати вірний пароль"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Попередження про небезпеку"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Попередження при Налаштуванні"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Модуль 'fileinfo' відсутній"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Локалізація не працює"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Інтернет-з'єднання не працює"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Спільний доступ"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Увімкнути API спільного доступу"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Дозволити програмам використовувати API спільного доступу"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Дозволити посилання"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Дозволити перевідкривати спільний доступ"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Безпека"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Примусове застосування HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Адреса сервера"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Облікові дані"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Протокол"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Рівень протоколювання"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "Більше"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Менше"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "Версія"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "Додати свою програму"
 msgid "More Apps"
 msgstr "Більше програм"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "Вибрати додаток"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "Перегляньте сторінку програм на apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
@@ -649,108 +665,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "Ваш пароль змінено"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "Не вдалося змінити Ваш пароль"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Поточний пароль"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Новий пароль"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "Ваша адреса електронної пошти"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "Мова"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "Допомогти з перекладом"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr ""
 
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 5aa076e5cb8..189454a8bba 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -421,41 +421,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Спеціальні Атрибути"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "Поле Квоти"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "Квота за замовчанням"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "Поле Ел. пошти"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "Правило іменування домашньої теки користувача"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -471,15 +482,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -516,10 +527,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index af1797fff03..ccec776d8f5 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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,36 +17,27 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -416,19 +415,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 ""
diff --git a/l10n/ur/files.po b/l10n/ur/files.po
index 3469a8e0a9e..7b6b3cbb2c0 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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,48 +17,48 @@ msgstr ""
 "Language: ur\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ur/files_external.po b/l10n/ur/files_external.po
index 7d2c65defbe..bf904c2d8f3 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ur/lib.po b/l10n/ur/lib.po
index eff2c9afe66..b21775ce5a5 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po
index d75ab573080..4461002aca5 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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ur/user_ldap.po b/l10n/ur/user_ldap.po
index 52d4b1c41d6..5cac65d044b 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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 24d51b764c2..b00e1bcc896 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,63 +134,63 @@ msgstr "نومبر"
 msgid "December"
 msgstr "دسمبر"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "منسوخ کریں"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "ایرر"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "شئیرنگ کے دوران ایرر"
 
@@ -416,19 +415,19 @@ msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -542,6 +541,18 @@ 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 "ذاتی"
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 4adcb1d0ec3..4a9be83d4b0 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: ur_PK\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,92 +156,92 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "ایرر"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -278,29 +278,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -308,113 +300,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index 097c73271cc..aa912e8f652 100644
--- a/l10n/ur_PK/files_external.po
+++ b/l10n/ur_PK/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "یوزرز"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index 91edc05d6a6..f06ab498fb2 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "آپ کے اختیار میں ویب سروسیز"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -336,3 +336,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 415f5dbd057..302512f11a2 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 9210c2d915a..7fcccee2a11 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index 796041e2231..6685162cdfb 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:992
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:993
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:994
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:995
+#: js/js.js:1127
 msgid "today"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1128
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:997
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1130
 msgid "last month"
 msgstr ""
 
-#: js/js.js:999
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1000
+#: js/js.js:1132
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:1001
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1002
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr ""
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -411,19 +410,19 @@ msgstr ""
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -537,6 +536,18 @@ 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 ""
diff --git a/l10n/uz/files.po b/l10n/uz/files.po
index 6be022eb5da..cbb3c8601e9 100644
--- a/l10n/uz/files.po
+++ b/l10n/uz/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ msgstr ""
 "Language: uz\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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -305,113 +297,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/uz/files_external.po b/l10n/uz/files_external.po
index f0b9b80128d..0a2cfee99a9 100644
--- a/l10n/uz/files_external.po
+++ b/l10n/uz/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/uz/lib.po b/l10n/uz/lib.po
index 1c2263d3a04..cb9c4b53ca4 100644
--- a/l10n/uz/lib.po
+++ b/l10n/uz/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-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po
index 19c7676cf7d..0e253ad5c70 100644
--- a/l10n/uz/settings.po
+++ b/l10n/uz/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/uz/user_ldap.po b/l10n/uz/user_ldap.po
index e93eae4a9d2..33dee47c293 100644
--- a/l10n/uz/user_ldap.po
+++ b/l10n/uz/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 28aa79291c7..ed1b8f6dd8e 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -21,36 +21,27 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Không thể gửi thư cho người dùng: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Bật chế độ bảo trì"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Tắt chế độ bảo trì"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 msgid "Updated database"
 msgstr "Cơ sở dữ liệu đã được cập nhật"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Đang cập nhật tập tin bộ nhớ cache, việc này có thể mất nhiều thời gian..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Đã cập nhật tập tin bộ nhớ cache"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% hoàn thành ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Không có hình ảnh hoặc tập tin được cung cấp"
@@ -147,59 +138,59 @@ msgstr "Tháng 11"
 msgid "December"
 msgstr "Tháng 12"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "Đang lưu..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n phút trước"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n giờ trước"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ngày trước"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n tháng trước"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "tháng trước"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "năm trước"
 
@@ -237,32 +228,40 @@ msgid "One file conflict"
 msgstr "Một tập tin xung đột"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "File mới"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "Bạn muốn tiếp tục với những tập tin nào?"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 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
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "Hủy"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(Tất cả các lựa chọn)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "({count} được chọn)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "Lỗi khi tải tập tin mẫu đã tồn tại"
 
@@ -295,11 +294,11 @@ msgid "Share"
 msgstr "Chia sẻ"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Lỗi"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Lỗi trong quá trình chia sẻ"
 
@@ -415,19 +414,19 @@ msgstr "Mật khẩu bảo vệ"
 msgid "Error unsetting expiration date"
 msgstr "Lỗi không thiết lập ngày kết thúc"
 
-#: js/share.js:723
+#: 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:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Đang gởi ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email đã được gửi"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Cảnh báo"
 
@@ -541,6 +540,18 @@ msgstr "Mật khẩu mới"
 msgid "Reset password"
 msgstr "Khôi phục mật khẩu"
 
+#: 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 "Cá nhân"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index d2c2ef46128..709b3b848ff 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -21,48 +21,48 @@ 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:57 js/files.js:98
+#: 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
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: 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."
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Nguồn không hợp lệ"
 
-#: ajax/newfile.php:101
+#: 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"
@@ -72,74 +72,74 @@ msgstr "Server cấm mở URLs, vui lòng kiểm tra lại cấu hình server"
 msgid "Error while downloading %s to %s"
 msgstr "Lỗi trong trong quá trình tải %s từ %s"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 msgid "Error when creating the file"
 msgstr "Lỗi khi tạo file"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Tên thư mục không thể để trống"
 
-#: ajax/newfolder.php:65
+#: 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
+#: ajax/upload.php:19 ajax/upload.php:57
 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
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "Xác thực không hợp lệ"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 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:74
+#: ajax/upload.php:82
 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:75
+#: ajax/upload.php:83
 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:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 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:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "Chưa có file nào được tải lên"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "Không tìm thấy thư mục tạm"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Không thể ghi "
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "Không đủ không gian lưu trữ"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 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:166
+#: ajax/upload.php:169
 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:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "Thư mục không hợp lệ"
 
@@ -160,90 +160,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/file-upload.js:383
+#: 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:475
+#: 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:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL không thể để trống"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} đã tồn tại"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "Không thể tạo file"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "Không thể tạo thư mục"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "Xóa vĩnh vễn"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "Sửa tên"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "Lỗi di chuyển tập tin"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "Lỗi"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "Đang chờ"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "Lỗi xóa file,"
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 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
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tập tin"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} và {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Đang tải lên %n tập tin"
@@ -279,29 +279,21 @@ msgid ""
 "your personal settings to decrypt your files."
 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:379
+#: js/files.js:331
 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:610 js/files.js:654
-msgid "Error moving file"
-msgstr "Lỗi di chuyển tập tin"
-
-#: js/files.js:610 js/files.js:654
-msgid "Error"
-msgstr "Lỗi"
-
-#: js/files.js:672 templates/index.php:68
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "Thay đổi"
 
@@ -309,113 +301,109 @@ msgstr "Thay đổi"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s không thể đổi tên"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "Tải lên"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "Xử lý tập tin"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "Kích thước tối đa "
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "tối đa cho phép:"
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "Cần thiết cho tải nhiều tập tin và thư mục."
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "Cho phép ZIP-download"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 là không giới hạn"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "Kích thước tối đa cho các tập tin ZIP"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "Lưu"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "Tạo mới"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "File text mới"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "Tập tin văn bản"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "Tạo thư mục"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "Thư mục"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "Từ liên kết"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "File đã bị xóa"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "Bạn không có quyền upload hoặc tạo files ở đây"
 
-#: templates/index.php:57
+#: templates/index.php:56
 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:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "Tập tin tải lên quá lớn"
 
-#: templates/index.php:100
+#: templates/index.php:98
 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:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng chờ."
 
-#: templates/index.php:108
+#: templates/index.php:106
 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_external.po b/l10n/vi/files_external.po
index 983d24f383f..ccd66738997 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã b
 msgid "Error configuring Google Drive storage"
 msgstr "Lỗi cấu hình lưu trữ Google Drive"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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ó."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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ó."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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>Cảnh báo:</b> Tính năng Curl trong PHP chưa được kích hoạt hoặc cài đặt. Việc gắn kết ownCloud / WebDAV hay GoogleDrive không thực hiện được. Vui lòng liên hệ người quản trị để cài đặt nó."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "Lưu trữ ngoài"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "Tên thư mục"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "Lưu trữ ngoài"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "Áp dụng"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "Thêm bộ nhớ"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "không"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "Tất cả người dùng"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "Nhóm"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "Người dùng"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "Kích hoạt tính năng lưu trữ ngoài"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "Chứng chỉ SSL root"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "Nhập Root Certificate"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 256526134a5..e1f9cb7d4c8 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr "Hình ảnh không hợp lệ"
 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:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "Tải về ZIP đã bị tắt."
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "Tập tin cần phải được tải về từng người một."
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "Trở lại tập tin"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP."
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s đã chia sẻ »%s« với bạn"
@@ -332,3 +332,21 @@ msgstr "năm trước"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "năm trước"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 2c2c6bfda32..fb289628500 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+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: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Email đã được gửi"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: 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:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -212,31 +212,31 @@ msgstr "Cập nhật"
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Cảnh bảo bảo mật"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 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:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Chia sẻ"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Bật chia sẻ API"
 
-#: templates/admin.php:191
+#: 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:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Cho phép liên kết"
 
-#: templates/admin.php:199
+#: 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:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Cho phép chia sẻ lại"
 
-#: templates/admin.php:217
+#: 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:224
+#: 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:227
+#: 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:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "Địa chỉ máy chủ"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "Cổng"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "Giấy chứng nhận"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "hơn"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "ít"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 6d8ab5dafc1..04ba1f8caa4 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "Theo Byte"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 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:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 84c78a196e6..01f7441f45e 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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"
@@ -22,36 +22,27 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "发送失败，用户如下: %s "
 
-#: 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 "...已完成 %d%% ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "没有提供图片或文件"
@@ -148,59 +139,59 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "保存中"
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "年前"
 
@@ -238,32 +229,40 @@ msgid "One file conflict"
 msgstr "1个文件冲突"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "新文件"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "想要保留哪一个文件呢？"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "如果同时选择了连个版本，复制的文件名将会添加上一个数字。"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "继续"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "(选中全部)"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "(选择了{count}个)"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "加载文件存在性模板失败"
 
@@ -296,11 +295,11 @@ msgid "Share"
 msgstr "分享"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "错误"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -416,19 +415,19 @@ msgstr "密码已受保护"
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "邮件已发送"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "警告"
 
@@ -542,6 +541,18 @@ 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 "个人"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index d58f5cf5a44..6d47ffa6b6c 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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"
@@ -21,48 +21,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "文件名不能为空。"
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "不是一个可用的源"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "服务器没有允许打开URL网址，请检查服务器配置"
@@ -72,74 +72,74 @@ msgstr "服务器没有允许打开URL网址，请检查服务器配置"
 msgid "Error while downloading %s to %s"
 msgstr "当下载 %s 到 %s 时出错"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "创建文件夹出错"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "无法设置上传文件夹。"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "无效密匙"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "文件上传成功，没有错误发生"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分（不完整）"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "没有足够的存储空间"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "上传失败。不能发现上传的文件"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "上传失败。不能获取文件信息。"
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -160,90 +160,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "不能从服务器得到结果"
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL不能为空"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "主目录里 'Shared' 是系统预留目录名"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "不能创建文件"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "不能创建文件夹"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr "获取URL出错"
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "移动文件错误"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "错误"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 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
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr "删除文件出错。"
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} 和 {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "上传 %n 个文件"
@@ -279,29 +279,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。"
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "修改日期"
 
@@ -309,113 +301,109 @@ msgstr "修改日期"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s 不能被重命名"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "上传"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "文件处理"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "最大上传大小"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "最大允许: "
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "多文件和文件夹下载需要此项。"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "启用 ZIP 下载"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0 为无限制"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP 文件的最大输入大小"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "保存"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "新建"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr "创建文本文件"
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "文本文件"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "添加文件夹"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "文件夹"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "来自链接"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "已删除文件"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "您没有权限来上传湖州哦和创建文件"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "删除"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "当前扫描"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "正在更新文件系统缓存..."
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 09e54dc7202..bb2b1684eee 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr "请提供有效的Dropbox应用key和secret"
 msgid "Error configuring Google Drive storage"
 msgstr "配置Google Drive存储时出错"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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 分享挂载无法实现。请咨询系统管理员进行安装。"
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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 分享挂载无法实现。请咨询系统管理员进行安装。"
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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 不能挂载。请请求您的系统管理员安装该它。"
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "外部存储"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "目录名称"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "外部存储"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "配置"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "选项"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "适用的"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "添加存储"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "未设置"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "所有用户"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "组"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "用户"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "删除"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "启用用户外部存储"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL根证书"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "导入根证书"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 63983129668..81c8dfbaedb 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -70,23 +70,23 @@ msgstr "无效的图像"
 msgid "web services under your control"
 msgstr "您控制的web服务"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已经关闭"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐一下载文件"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "回到文件"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大，无法生成 zip 文件。"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -197,8 +197,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL 用户名和/或密码无效：%s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
 
@@ -211,9 +211,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "数据库错误：\"%s\""
@@ -222,9 +222,9 @@ msgstr "数据库错误：\"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "冲突命令为：\"%s\""
@@ -260,7 +260,7 @@ msgstr "Oracle 数据库用户名和/或密码无效"
 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 数据库用户名和/或密码无效"
 
@@ -272,19 +272,19 @@ msgstr "请设置一个管理员用户名。"
 msgid "Set an admin password."
 msgstr "请设置一个管理员密码。"
 
-#: private/setup.php:198
+#: 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 "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: private/setup.php:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s 向您分享了 »%s«"
@@ -337,3 +337,21 @@ msgstr "去年"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "年前"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "必须提供合法的用户名"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "必须提供合法的密码"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 1ed696a2001..4b19e0c792f 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -54,15 +54,15 @@ msgstr "邮件已发送"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -71,7 +71,7 @@ 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 "认证出错"
 
@@ -133,32 +133,32 @@ msgstr "无法从组%s中移除用户"
 msgid "Couldn't update app."
 msgstr "无法更新 app。"
 
-#: 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 "不能更改密码"
 
@@ -210,7 +210,7 @@ msgstr "更新 app 时出错"
 msgid "Error"
 msgstr "错误"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "更新"
 
@@ -218,7 +218,7 @@ msgstr "更新"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "正在解密文件... 请稍等，可能需要一些时间。"
 
@@ -291,7 +291,7 @@ msgstr "必须提供合法的密码"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告：用户 \"{user}\" 的家目录已存在"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "简体中文"
 
@@ -339,18 +339,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -359,68 +359,68 @@ msgid ""
 "root."
 msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。"
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "设置警告"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "模块'文件信息'丢失"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "您的 PHP 版本不是最新版"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "本地化无法工作"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "因特网连接无法工作"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -429,162 +429,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接."
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "计划任务"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "共享"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "启用共享API"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "允许应用软件使用共享API"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "允许用户使用连接公开共享项目"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "允许公开上传"
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "用户可让其他人上传到他的公开共享文件夹"
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "允许再次共享"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户将共享给他们的项目再次共享"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人共享"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "允许用户只向同组用户共享"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "允许邮件通知"
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "允许用户为共享的文件发送邮件通知"
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "强制客户端通过加密连接连接到%s。"
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "服务器地址"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "端口"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "凭证"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -602,23 +618,23 @@ msgstr "添加应用"
 msgid "More Apps"
 msgstr "更多应用"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "选择一个应用"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "查看在 app.owncloud.com 的应用程序页面"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>"
 
@@ -655,108 +671,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "密码已修改"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "无法修改密码"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "当前密码"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr "全名"
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "您的电子邮件"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "联系人图片"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "上传新的"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "从文件中选择一个新的"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "移除图片"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr "您的头像由您的原始账户所提供。"
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "登录密码"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "解密所有文件"
 
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 723367bdbe1..d58c0a99e59 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "配额字段"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "默认配额"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "电邮字段"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "用户主目录命名规则"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "内部用户名"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr "内部用户名属性："
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr "超越UUID检测"
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr "用户名-LDAP用户映射"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr "清除用户-LDAP用户映射"
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "清除组用户-LDAP级映射"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 6c505501014..a3f0d6b64eb 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -17,36 +17,27 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: 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 ""
@@ -143,59 +134,59 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "前一月"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "個月之前"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr ""
 
@@ -233,32 +224,40 @@ msgid "One file conflict"
 msgstr ""
 
 #: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
 msgstr ""
 
 #: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,11 +290,11 @@ msgid "Share"
 msgstr "分享"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -411,19 +410,19 @@ msgstr "密碼保護"
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "傳送中"
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "郵件已傳"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -537,6 +536,18 @@ 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 "個人"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 7382af274bb..f42c481a557 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 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"
@@ -17,48 +17,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -68,74 +68,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr ""
 
@@ -156,90 +156,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
-msgid "Pending"
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "Could not rename file"
-msgstr ""
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "錯誤"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:591
-msgid "undo"
+#: js/filelist.js:630
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -275,29 +275,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr ""
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr ""
 
@@ -305,113 +297,109 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "上傳"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "儲存"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index a65b3d8e315..3336ef9e4cf 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -37,91 +37,100 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 msgid ""
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
-"is not possible. Please ask your system administrator to install it."
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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."
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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."
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Applicable"
+#: templates/settings.php:12
+msgid "Available for"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
-msgid "None set"
+#: templates/settings.php:92
+msgid "No user or group"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "群組"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "用戶"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 6219708a091..5af2222d381 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -65,23 +65,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -192,8 +192,8 @@ 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 ""
 
@@ -206,9 +206,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 ""
@@ -217,9 +217,9 @@ 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 ""
@@ -255,7 +255,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 ""
 
@@ -267,19 +267,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:198
+#: 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:199
+#: 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
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -332,3 +332,21 @@ msgstr ""
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index d4c6b39c80f..abc1f449b54 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-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"
@@ -47,15 +47,15 @@ msgstr "郵件已傳"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -332,18 +332,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -352,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -422,162 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:184
+#: 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 "
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 690f08e838e..96105f465a5 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -417,41 +417,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 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:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index bcbda8ad0fe..6922de1a288 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-08 06:10+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,36 +19,27 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "無法寄送郵件給這些使用者：%s"
 
-#: 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 "已完成 %d%%"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "未提供圖片或檔案"
@@ -145,59 +136,59 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:458
+#: js/js.js:479
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:496
+#: js/js.js:564
 msgid "Saving..."
 msgstr "儲存中..."
 
-#: js/js.js:995
+#: js/js.js:1124
 msgid "seconds ago"
 msgstr "幾秒前"
 
-#: js/js.js:996
+#: js/js.js:1125
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分鐘前"
 
-#: js/js.js:997
+#: js/js.js:1126
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小時前"
 
-#: js/js.js:998
+#: js/js.js:1127
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:999
+#: js/js.js:1128
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:1000
+#: js/js.js:1129
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: js/js.js:1001
+#: js/js.js:1130
 msgid "last month"
 msgstr "上個月"
 
-#: js/js.js:1002
+#: js/js.js:1131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 個月前"
 
-#: js/js.js:1003
+#: js/js.js:1132
 msgid "months ago"
 msgstr "幾個月前"
 
-#: js/js.js:1004
+#: js/js.js:1133
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:1005
+#: js/js.js:1134
 msgid "years ago"
 msgstr "幾年前"
 
@@ -235,32 +226,40 @@ msgid "One file conflict"
 msgstr "一個檔案衝突"
 
 #: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr "新檔案"
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
 msgid "Which files do you want to keep?"
 msgstr "您要保留哪一個檔案？"
 
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "如果您同時選擇兩個版本，被複製的那個檔案名稱後面會加上編號"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
 msgid "Continue"
 msgstr "繼續"
 
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "(all selected)"
 msgstr "（已全選）"
 
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
 msgid "({count} selected)"
 msgstr "（已選 {count} 項）"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
 msgid "Error loading file exists template"
 msgstr "載入檔案存在樣板出錯"
 
@@ -293,11 +292,11 @@ msgid "Share"
 msgstr "分享"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -413,19 +412,19 @@ msgstr "受密碼保護"
 msgid "Error unsetting expiration date"
 msgstr "取消到期日設定失敗"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "設定到期日發生錯誤"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "正在傳送…"
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email 已寄出"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "警告"
 
@@ -539,6 +538,18 @@ 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 "個人"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index ec65b56ee87..c2eeb6fc27e 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-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-04 01:55-0400\n"
+"PO-Revision-Date: 2014-04-04 05:56+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,48 +19,48 @@ 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:57 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "檔名不能為空"
 
-#: ajax/newfile.php:62
+#: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "檔名不合法，不允許 \\ / < > : \" | ? * 字元"
 
-#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
 #: 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
+#: 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:96
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "不是有效的來源"
 
-#: ajax/newfile.php:101
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
@@ -70,74 +70,74 @@ msgstr ""
 msgid "Error while downloading %s to %s"
 msgstr "下載 %s 到 %s 失敗"
 
-#: ajax/newfile.php:155
+#: ajax/newfile.php:146
 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:65
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "建立資料夾失敗"
 
-#: ajax/upload.php:19 ajax/upload.php:53
+#: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
 msgstr "無法設定上傳目錄"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:33
 msgid "Invalid Token"
 msgstr "無效的 token"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
 msgstr "沒有檔案被上傳，原因未知"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:82
 msgid "There is no error, the file uploaded with success"
 msgstr "一切都順利，檔案上傳成功"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定："
 
-#: ajax/upload.php:77
+#: ajax/upload.php:85
 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:78
+#: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
 msgstr "只有檔案的一部分被上傳"
 
-#: ajax/upload.php:79
+#: ajax/upload.php:87
 msgid "No file was uploaded"
 msgstr "沒有檔案被上傳"
 
-#: ajax/upload.php:80
+#: ajax/upload.php:88
 msgid "Missing a temporary folder"
 msgstr "找不到暫存資料夾"
 
-#: ajax/upload.php:81
+#: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
-#: ajax/upload.php:99
+#: ajax/upload.php:107
 msgid "Not enough storage available"
 msgstr "儲存空間不足"
 
-#: ajax/upload.php:156
+#: ajax/upload.php:159
 msgid "Upload failed. Could not find uploaded file"
 msgstr "上傳失敗，找不到上傳的檔案"
 
-#: ajax/upload.php:166
+#: ajax/upload.php:169
 msgid "Upload failed. Could not get file info."
 msgstr "上傳失敗，無法取得檔案資訊"
 
-#: ajax/upload.php:185
+#: ajax/upload.php:184
 msgid "Invalid directory."
 msgstr "無效的資料夾"
 
@@ -158,90 +158,90 @@ msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:338
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "上傳已取消"
 
-#: js/file-upload.js:383
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "無法從伺服器取回結果"
 
-#: js/file-upload.js:475
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中，離開此頁面將會取消上傳。"
 
-#: js/file-upload.js:562
+#: js/file-upload.js:542
 msgid "URL cannot be empty"
 msgstr "URL 不能留空"
 
-#: js/file-upload.js:566
+#: js/file-upload.js:546
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "在家目錄中不能使用「共享」作為檔名"
 
-#: js/file-upload.js:568 js/filelist.js:430
+#: js/file-upload.js:548 js/filelist.js:603
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/file-upload.js:634
+#: js/file-upload.js:600
 msgid "Could not create file"
 msgstr "無法建立檔案"
 
-#: js/file-upload.js:650
+#: js/file-upload.js:613
 msgid "Could not create folder"
 msgstr "無法建立資料夾"
 
-#: js/file-upload.js:700
+#: js/file-upload.js:653
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:149
+#: js/fileactions.js:164
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:162
+#: js/fileactions.js:177
 msgid "Delete permanently"
 msgstr "永久刪除"
 
-#: js/fileactions.js:223
+#: js/fileactions.js:238
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "移動檔案失敗"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "錯誤"
+
+#: js/filelist.js:267 js/filelist.js:1113
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:456
+#: js/filelist.js:630
 msgid "Could not rename file"
 msgstr "無法重新命名"
 
-#: js/filelist.js:591
-msgid "replaced {new_name} with {old_name}"
-msgstr "使用 {new_name} 取代 {old_name}"
-
-#: js/filelist.js:591
-msgid "undo"
-msgstr "復原"
-
-#: js/filelist.js:662
+#: js/filelist.js:789
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個資料夾"
 
-#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個檔案"
 
-#: js/filelist.js:695
+#: js/filelist.js:822
 msgid "{dirs} and {files}"
 msgstr "{dirs} 和 {files}"
 
-#: js/filelist.js:931 js/filelist.js:969
+#: js/filelist.js:1052 js/filelist.js:1090
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個檔案正在上傳"
@@ -277,29 +277,21 @@ msgid ""
 "your personal settings to decrypt your files."
 msgstr "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。"
 
-#: js/files.js:379
+#: js/files.js:331
 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
+#: js/files.js:570 templates/index.php:67
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:673 templates/index.php:80
+#: js/files.js:571 templates/index.php:79
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:674 templates/index.php:82
+#: js/files.js:572 templates/index.php:81
 msgid "Modified"
 msgstr "修改時間"
 
@@ -307,113 +299,109 @@ msgstr "修改時間"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:111
+#: lib/app.php:93
 #, php-format
 msgid "%s could not be renamed"
 msgstr "無法重新命名 %s"
 
-#: lib/helper.php:14 templates/index.php:23
+#: lib/helper.php:14 templates/index.php:22
 msgid "Upload"
 msgstr "上傳"
 
-#: templates/admin.php:5
+#: templates/admin.php:4
 msgid "File handling"
 msgstr "檔案處理"
 
-#: templates/admin.php:7
+#: templates/admin.php:6
 msgid "Maximum upload size"
 msgstr "上傳限制"
 
-#: templates/admin.php:10
+#: templates/admin.php:9
 msgid "max. possible: "
 msgstr "最大允許："
 
-#: templates/admin.php:15
+#: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
 msgstr "下載多檔案和目錄時，此項是必填的。"
 
-#: templates/admin.php:17
+#: templates/admin.php:16
 msgid "Enable ZIP-download"
 msgstr "啟用 ZIP 下載"
 
-#: templates/admin.php:20
+#: templates/admin.php:19
 msgid "0 is unlimited"
 msgstr "0代表沒有限制"
 
-#: templates/admin.php:22
+#: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP 壓縮前的原始大小限制"
 
-#: templates/admin.php:26
+#: templates/admin.php:25
 msgid "Save"
 msgstr "儲存"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr "新增"
 
-#: templates/index.php:9
+#: templates/index.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:9
 msgid "Text file"
 msgstr "文字檔"
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "New folder"
 msgstr "新資料夾"
 
-#: templates/index.php:14
+#: templates/index.php:13
 msgid "Folder"
 msgstr "資料夾"
 
-#: templates/index.php:17
+#: templates/index.php:16
 msgid "From link"
 msgstr "從連結"
 
-#: templates/index.php:41
+#: templates/index.php:40
 msgid "Deleted files"
 msgstr "回收桶"
 
-#: templates/index.php:46
+#: templates/index.php:45
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:52
+#: templates/index.php:51
 msgid "You don’t have permission to upload or create files here"
 msgstr "您沒有權限在這裡上傳或建立檔案"
 
-#: templates/index.php:57
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "這裡還沒有東西，上傳一些吧！"
 
-#: templates/index.php:74
+#: templates/index.php:73
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/index.php:98
+#: templates/index.php:96
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您試圖上傳的檔案大小超過伺服器的限制。"
 
-#: templates/index.php:105
+#: templates/index.php:103
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案，請稍等。"
 
-#: templates/index.php:108
+#: templates/index.php:106
 msgid "Current scanning"
 msgstr "正在掃描"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "正在升級檔案系統快取…"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index b55ed7de369..10fa76b3d61 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 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"
@@ -38,91 +38,100 @@ msgstr "請提供有效的 Dropbox app key 和 app secret 。"
 msgid "Error configuring Google Drive storage"
 msgstr "設定 Google Drive 儲存時發生錯誤"
 
-#: js/settings.js:313 js/settings.js:320
+#: js/settings.js:318 js/settings.js:325
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:512
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
 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 分享，請洽您的系統管理員將其安裝。"
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:516
+#: lib/config.php:626
+#, php-format
 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 分享，請洽您的系統管理員將其安裝並啓用。"
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
 
-#: lib/config.php:519
+#: lib/config.php:628
+#, php-format
 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 或 Google Drive 分享，請洽您的系統管理員將其安裝並啓用。"
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "External Storage"
 msgstr "外部儲存"
 
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
 msgstr "資料夾名稱"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "External storage"
 msgstr "外部儲存"
 
-#: templates/settings.php:11
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "設定"
 
-#: templates/settings.php:12
+#: templates/settings.php:11
 msgid "Options"
 msgstr "選項"
 
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "可用的"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:32
 msgid "Add storage"
 msgstr "增加儲存區"
 
-#: templates/settings.php:90
-msgid "None set"
-msgstr "尚未設定"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:95
 msgid "All Users"
 msgstr "所有使用者"
 
-#: templates/settings.php:92
+#: templates/settings.php:97
 msgid "Groups"
 msgstr "群組"
 
-#: templates/settings.php:100
+#: templates/settings.php:105
 msgid "Users"
 msgstr "使用者"
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:155 templates/settings.php:156
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/settings.php:127
+#: templates/settings.php:132
 msgid "Enable User External Storage"
 msgstr "啓用使用者外部儲存"
 
-#: templates/settings.php:130
+#: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:147
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr "SSL 根憑證"
 
-#: templates/settings.php:165
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr "匯入根憑證"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 003cb69e59a..509f97f58f7 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -67,23 +67,23 @@ msgstr "無效的圖片"
 msgid "web services under your control"
 msgstr "由您控制的網路服務"
 
-#: private/files.php:231
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr "ZIP 下載已關閉。"
 
-#: private/files.php:232
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr "檔案需要逐一下載。"
 
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr "回到檔案列表"
 
-#: private/files.php:258
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr "選擇的檔案太大以致於無法產生壓縮檔。"
 
-#: private/files.php:259
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -194,8 +194,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL 使用者和/或密碼無效：%s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "您必須輸入一個現有的帳號或管理員帳號。"
 
@@ -208,9 +208,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "資料庫錯誤：\"%s\""
@@ -219,9 +219,9 @@ msgstr "資料庫錯誤：\"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "有問題的指令是：\"%s\""
@@ -257,7 +257,7 @@ msgstr "Oracle 用戶名和/或密碼無效"
 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 用戶名和/或密碼無效"
 
@@ -269,19 +269,19 @@ msgstr "設定管理員帳號。"
 msgid "Set an admin password."
 msgstr "設定管理員密碼。"
 
-#: private/setup.php:198
+#: 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:199
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
 
-#: private/share/mailnotifications.php:73
-#: private/share/mailnotifications.php:119
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s 與您分享了 %s"
@@ -334,3 +334,21 @@ msgstr "去年"
 #: private/template/functions.php:145
 msgid "years ago"
 msgstr "幾年前"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "必須提供一個有效的用戶名"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "一定要提供一個有效的密碼"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index c1509ba9a82..df741fa89fc 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+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"
@@ -48,15 +48,15 @@ msgstr "Email 已寄出"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:299
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:336
 msgid "Authentication method"
 msgstr ""
 
@@ -65,7 +65,7 @@ msgid "Unable to load list from App Store"
 msgstr "無法從 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 "認證錯誤"
 
@@ -127,32 +127,32 @@ msgstr "使用者移出群組 %s 錯誤"
 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 "無法修改密碼"
 
@@ -204,7 +204,7 @@ msgstr "更新應用程式錯誤"
 msgid "Error"
 msgstr "錯誤"
 
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
 msgid "Update"
 msgstr "更新"
 
@@ -212,7 +212,7 @@ msgstr "更新"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:244
+#: js/personal.js:243
 msgid "Select a profile picture"
 msgstr "選擇大頭貼"
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:313
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "檔案解密中，請稍候。"
 
@@ -285,7 +285,7 @@ msgstr "一定要提供一個有效的密碼"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告：使用者 {user} 的家目錄已經存在"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -333,18 +333,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "安全性警告"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -353,68 +353,68 @@ msgid ""
 "root."
 msgstr "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。"
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "設定警告"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。"
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "遺失 'fileinfo' 模組"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "未偵測到 PHP 模組 'fileinfo'。我們強烈建議啟用這個模組以取得最好的 mime-type 支援。"
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "語系無法運作"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "無網際網路存取"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -423,162 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。"
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: 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:171
+#: 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:179
+#: 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:184
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "分享"
 
-#: templates/admin.php:190
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "啟用分享 API"
 
-#: templates/admin.php:191
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "允許 apps 使用分享 API"
 
-#: templates/admin.php:198
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "允許連結"
 
-#: templates/admin.php:199
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "允許使用者以結連公開分享檔案"
 
-#: templates/admin.php:207
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "允許任何人上傳"
 
-#: templates/admin.php:208
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "允許使用者將他們公開分享的資料夾設定為「任何人皆可上傳」"
 
-#: templates/admin.php:216
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "允許轉貼分享"
 
-#: templates/admin.php:217
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "允許使用者分享其他使用者分享給他的檔案"
 
-#: templates/admin.php:224
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "允許使用者與任何人分享檔案"
 
-#: templates/admin.php:227
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "僅允許使用者在群組內分享"
 
-#: templates/admin.php:234
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "允許郵件通知"
 
-#: templates/admin.php:235
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "允許使用者分享檔案時寄出通知郵件"
 
-#: templates/admin.php:242
+#: templates/admin.php:261
 msgid "Security"
 msgstr "安全性"
 
-#: templates/admin.php:255
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "強制啟用 HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "強迫用戶端使用加密連線連接到 %s"
 
-#: templates/admin.php:263
+#: 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:275
+#: templates/admin.php:294
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:296
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:327
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:349
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:353
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: templates/admin.php:338
+#: templates/admin.php:357
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/admin.php:343
+#: templates/admin.php:362
 msgid "Credentials"
 msgstr "認證"
 
-#: templates/admin.php:344
+#: templates/admin.php:363
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:366
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:370
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:371
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:376
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:358
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:390
+#: templates/admin.php:409
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:391
+#: templates/admin.php:410
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -596,23 +612,23 @@ msgstr "添加你的 App"
 msgid "More Apps"
 msgstr "更多Apps"
 
-#: templates/apps.php:37
+#: templates/apps.php:38
 msgid "Select an App"
 msgstr "選擇一個應用程式"
 
-#: templates/apps.php:42
+#: templates/apps.php:43
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:48
+#: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
 msgstr "查看應用程式頁面於 apps.owncloud.com"
 
-#: templates/apps.php:50
+#: templates/apps.php:51
 msgid "See application website"
 msgstr ""
 
-#: templates/apps.php:52
+#: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>"
 
@@ -649,108 +665,108 @@ 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:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "密碼"
 
-#: templates/personal.php:40
+#: templates/personal.php:39
 msgid "Your password was changed"
 msgstr "你的密碼已更改"
 
-#: templates/personal.php:41
+#: templates/personal.php:40
 msgid "Unable to change your password"
 msgstr "無法變更您的密碼"
 
-#: templates/personal.php:43
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "目前密碼"
 
-#: templates/personal.php:46
+#: templates/personal.php:45
 msgid "New password"
 msgstr "新密碼"
 
-#: templates/personal.php:50
+#: templates/personal.php:49
 msgid "Change password"
 msgstr "變更密碼"
 
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:81
+#: templates/personal.php:76
 msgid "Email"
 msgstr "信箱"
 
-#: templates/personal.php:83
+#: templates/personal.php:78
 msgid "Your email address"
 msgstr "您的電子郵件信箱"
 
-#: templates/personal.php:86
+#: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:89
 msgid "Profile picture"
 msgstr "個人資料照片"
 
-#: templates/personal.php:101
+#: templates/personal.php:94
 msgid "Upload new"
 msgstr "上傳新的"
 
-#: templates/personal.php:103
+#: templates/personal.php:96
 msgid "Select new from Files"
 msgstr "從已上傳的檔案中選一個"
 
-#: templates/personal.php:104
+#: templates/personal.php:97
 msgid "Remove image"
 msgstr "移除圖片"
 
-#: templates/personal.php:105
+#: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它"
 
-#: templates/personal.php:107
+#: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:111
+#: templates/personal.php:104
 msgid "Cancel"
 msgstr "取消"
 
-#: templates/personal.php:112
+#: templates/personal.php:105
 msgid "Choose as profile image"
 msgstr "設定為大頭貼"
 
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
 msgstr "語言"
 
-#: templates/personal.php:140
+#: templates/personal.php:131
 msgid "Help translate"
 msgstr "幫助翻譯"
 
-#: templates/personal.php:147
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:149
+#: templates/personal.php:139
 #, 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:161
+#: templates/personal.php:151
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:167
+#: templates/personal.php:157
 msgid "Log-in password"
 msgstr "登入密碼"
 
-#: templates/personal.php:172
+#: templates/personal.php:162
 msgid "Decrypt all Files"
 msgstr "解密所有檔案"
 
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 47eae57c809..8f76848a295 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+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"
@@ -419,41 +419,52 @@ msgid ""
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
 msgid "Special Attributes"
 msgstr "特殊屬性"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Field"
 msgstr "配額欄位"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Quota Default"
 msgstr "預設配額"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "in bytes"
 msgstr "以位元組為單位"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "Email Field"
 msgstr "電郵欄位"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "User Home Folder Naming Rule"
 msgstr "使用者家目錄的命名規則"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid "Internal Username"
 msgstr "內部使用者名稱"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 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 "
@@ -469,15 +480,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 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. "
@@ -514,10 +525,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/lib/base.php b/lib/base.php
index 73553ff6417..6ea77aa7a58 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -98,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/';
@@ -303,6 +305,7 @@ class OC {
 		OC_Util::addScript("jquery.placeholder");
 		OC_Util::addScript("jquery-tipsy");
 		OC_Util::addScript("compatibility");
+		OC_Util::addScript("underscore");
 		OC_Util::addScript("jquery.ocdialog");
 		OC_Util::addScript("oc-dialogs");
 		OC_Util::addScript("js");
@@ -518,6 +521,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;
@@ -546,16 +550,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
@@ -656,10 +654,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');
 		}
 	}
 
@@ -848,7 +846,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);
 		}
@@ -920,7 +918,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();
@@ -931,11 +929,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;
@@ -954,4 +947,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 00000000000..15f78e0bce6
--- /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 bf9215e3506..c8b51a3bb7e 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -8,15 +8,22 @@ $TRANSLATIONS = array(
 "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" => "صور",
@@ -25,8 +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/MariaDB username and/or password not valid" => "اسم مستخدم أو كلمة مرور MySQL/MariaDB  غير صحيحين",
 "DB Error: \"%s\"" => "خطأ في قواعد البيانات : \"%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",
+"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 غير صحيحة",
@@ -34,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("","","","","",""),
@@ -44,6 +56,8 @@ $TRANSLATIONS = array(
 "last month" => "الشهر الماضي",
 "_%n month ago_::_%n months ago_" => array("","","","","",""),
 "last year" => "السنةالماضية",
-"years ago" => "سنة مضت"
+"years ago" => "سنة مضت",
+"A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
+"A valid password must be provided" => "يجب ادخال كلمة مرور صحيحة"
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php
new file mode 100644
index 00000000000..93a20beb5d4
--- /dev/null
+++ b/lib/l10n/ast.php
@@ -0,0 +1,26 @@
+<?php
+$TRANSLATIONS = array(
+"Personal" => "Personal",
+"Settings" => "Axustes",
+"Users" => "Usuarios",
+"Failed to upgrade \"%s\"." => "Fallu al anovar \"%s\".",
+"Invalid image" => "Imaxe inválida",
+"Application is not enabled" => "L'aplicación nun ta habilitada",
+"Files" => "Ficheros",
+"Text" => "Testu",
+"Images" => "Imaxes",
+"Set an admin username." => "Afitar nome d'usuariu p'almin",
+"Set an admin password." => "Afitar contraseña p'almin",
+"Could not find category \"%s\"" => "Nun pudo alcontrase la estaya \"%s.\"",
+"seconds ago" => "fai segundos",
+"_%n minute ago_::_%n minutes ago_" => array("","fai %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("","fai %n hores"),
+"today" => "güei",
+"yesterday" => "ayeri",
+"_%n day go_::_%n days ago_" => array("","fai %n díes"),
+"last month" => "mes caberu",
+"_%n month ago_::_%n months ago_" => array("","fai %n meses"),
+"last year" => "añu caberu",
+"years ago" => "fai años"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/az.php b/lib/l10n/az.php
index e7b09649a24..15f78e0bce6 100644
--- a/lib/l10n/az.php
+++ b/lib/l10n/az.php
@@ -1,8 +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("")
+"_%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;";
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 88bb8ec9eee..477cdf2925b 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -66,6 +66,9 @@ $TRANSLATIONS = array(
 "last month" => "el mes passat",
 "_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
 "last year" => "l'any passat",
-"years ago" => "anys enrere"
+"years ago" => "anys enrere",
+"A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid",
+"A valid password must be provided" => "Heu de facilitar una contrasenya vàlida",
+"The username is already being used" => "El nom d'usuari ja està en ús"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 7969060b2cd..d535b97f631 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -44,9 +44,9 @@ $TRANSLATIONS = array(
 "DB Error: \"%s\"" => "Chyba databáze: \"%s\"",
 "Offending command was: \"%s\"" => "Příslušný příkaz byl: \"%s\"",
 "MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB uživatel '%s'@'localhost' již existuje.",
-"Drop this user from MySQL/MariaDB" => "Zahodit uživatele z MySQL/MariaDB",
+"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." => "Zahodit uživatele z MySQL/MariaDB.",
+"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",
@@ -66,6 +66,9 @@ $TRANSLATIONS = array(
 "last month" => "minulý měsíc",
 "_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
 "last year" => "minulý rok",
-"years ago" => "před lety"
+"years ago" => "před lety",
+"A valid username must be provided" => "Musíte zadat platné uživatelské jméno",
+"A valid password must be provided" => "Musíte zadat platné heslo",
+"The username is already being used" => "Uživatelské jméno je již využíváno"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 755033f8657..3be45001030 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -31,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",
@@ -39,8 +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/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/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",
@@ -60,6 +66,8 @@ $TRANSLATIONS = array(
 "last month" => "sidste måned",
 "_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
 "last year" => "sidste år",
-"years ago" => "år siden"
+"years ago" => "år siden",
+"A valid username must be provided" => "Et gyldigt brugernavn skal angives",
+"A valid password must be provided" => "En gyldig adgangskode skal angives"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index d644582b91e..297cc57bde7 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "Letzten Monat",
 "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
-"years ago" => "Vor Jahren"
+"years ago" => "Vor Jahren",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Folgende Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\" und \"_.@-\"",
+"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
+"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
+"The username is already being used" => "Dieser Benutzername existiert bereits"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_CH.php b/lib/l10n/de_CH.php
index fe1a519ccf7..e034cc3c209 100644
--- a/lib/l10n/de_CH.php
+++ b/lib/l10n/de_CH.php
@@ -47,6 +47,8 @@ $TRANSLATIONS = array(
 "last month" => "Letzten Monat",
 "_%n month ago_::_%n months ago_" => array("","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
-"years ago" => "Vor  Jahren"
+"years ago" => "Vor  Jahren",
+"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
+"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 85ed7e5c80a..d0a4a9b1c6e 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "Letzten Monat",
 "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
-"years ago" => "Vor  Jahren"
+"years ago" => "Vor  Jahren",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Folgende Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\" und \"_.@-\"",
+"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
+"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
+"The username is already being used" => "Der Benutzername existiert bereits"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 148b7fc1fe5..244cc50b847 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -44,7 +44,9 @@ $TRANSLATIONS = array(
 "DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
 "Offending command was: \"%s\"" => "Η εντολη παραβατικοτητας ηταν: \"%s\"",
 "MySQL/MariaDB user '%s'@'localhost' exists already." => "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL/MariaDB",
+"Drop this user from MySQL/MariaDB" => "Κατάργηση του χρήστη από MySQL/MariaDB",
 "MySQL/MariaDB user '%s'@'%%' already exists" => "Υπάρχει ήδη ο χρήστης '%s'@'%%' της MySQL/MariaDB",
+"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",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
 "last month" => "τελευταίο μήνα",
 "_%n month ago_::_%n months ago_" => array("","%n μήνες πριν"),
 "last year" => "τελευταίο χρόνο",
-"years ago" => "χρόνια πριν"
+"years ago" => "χρόνια πριν",
+"A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
+"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index 7d2246eb66b..e1c49392bd8 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "last month",
 "_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
 "last year" => "last year",
-"years ago" => "years ago"
+"years ago" => "years ago",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
+"A valid username must be provided" => "A valid username must be provided",
+"A valid password must be provided" => "A valid password must be provided",
+"The username is already being used" => "The username is already being used"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 14d6435c891..c01239cca7a 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "mes pasado",
 "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
 "last year" => "año pasado",
-"years ago" => "hace años"
+"years ago" => "hace años",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
+"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
+"A valid password must be provided" => "Se debe proporcionar una contraseña válida",
+"The username is already being used" => "El nombre de usuario ya está en uso"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index a925e22ba88..34775b16b22 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "last month" => "el mes pasado",
 "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
 "last year" => "el año pasado",
-"years ago" => "años atrás"
+"years ago" => "años atrás",
+"A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
+"A valid password must be provided" => "Debe ingresar una contraseña válida"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_MX.php b/lib/l10n/es_MX.php
index 2f0ed33f6b3..befb076b7de 100644
--- a/lib/l10n/es_MX.php
+++ b/lib/l10n/es_MX.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "last month" => "mes pasado",
 "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
 "last year" => "año pasado",
-"years ago" => "hace años"
+"years ago" => "hace años",
+"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
+"A valid password must be provided" => "Se debe proporcionar una contraseña válida"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index f6435320c6c..883c7323c0c 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Rakendus pole sisse lülitatud",
 "Authentication error" => "Autentimise viga",
 "Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
+"Unknown user" => "Tundmatu kasutaja",
 "Files" => "Failid",
 "Text" => "Tekst",
 "Images" => "Pildid",
@@ -39,8 +40,13 @@ $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/MariaDB username and/or password not valid" => "MySQL/MariaDB kasutajatunnus ja/või parool pole õiged",
 "DB Error: \"%s\"" => "Andmebaasi viga: \"%s\"",
 "Offending command was: \"%s\"" => "Tõrkuv käsk oli: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB kasutaja '%s'@'localhost' on juba olemas.",
+"Drop this user from MySQL/MariaDB" => "Kustuta see MySQL/MariaDB kasutaja",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB user '%s'@'%%' on juba olemas",
+"Drop this user from MySQL/MariaDB." => "Kustuta see MySQL/MariaDB kasutaja.",
 "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",
@@ -60,6 +66,9 @@ $TRANSLATIONS = array(
 "last month" => "viimasel kuul",
 "_%n month ago_::_%n months ago_" => array("","%n kuud tagasi"),
 "last year" => "viimasel aastal",
-"years ago" => "aastat tagasi"
+"years ago" => "aastat tagasi",
+"A valid username must be provided" => "Sisesta nõuetele vastav kasutajatunnus",
+"A valid password must be provided" => "Sisesta nõuetele vastav parool",
+"The username is already being used" => "Kasutajanimi on juba kasutuses"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 58c198cff14..7a8a11f5b32 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -60,6 +60,9 @@ $TRANSLATIONS = array(
 "last month" => "joan den hilabetean",
 "_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"),
 "last year" => "joan den urtean",
-"years ago" => "urte"
+"years ago" => "urte",
+"A valid username must be provided" => "Baliozko erabiltzaile izena eman behar da",
+"A valid password must be provided" => "Baliozko pasahitza eman behar da",
+"The username is already being used" => "Erabiltzaile izena dagoeneko erabiltzen ari da"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index 7323ffe1918..c1c16cf94b4 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -42,6 +42,8 @@ $TRANSLATIONS = array(
 "last month" => "ماه قبل",
 "_%n month ago_::_%n months ago_" => array(""),
 "last year" => "سال قبل",
-"years ago" => "سال‌های قبل"
+"years ago" => "سال‌های قبل",
+"A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
+"A valid password must be provided" => "رمز عبور صحیح باید وارد شود"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 018e4c04c4f..13e97e1b677 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -59,6 +59,10 @@ $TRANSLATIONS = array(
 "last month" => "viime kuussa",
 "_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
 "last year" => "viime vuonna",
-"years ago" => "vuotta sitten"
+"years ago" => "vuotta sitten",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Vain seuraavat merkit ovat sallittuja käyttäjätunnuksessa: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\"",
+"A valid username must be provided" => "Anna kelvollinen käyttäjätunnus",
+"A valid password must be provided" => "Anna kelvollinen salasana",
+"The username is already being used" => "Käyttäjätunnus on jo käytössä"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index d866fb664ee..b13970c610d 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "le mois dernier",
 "_%n month ago_::_%n months ago_" => array("","Il y a %n mois"),
 "last year" => "l'année dernière",
-"years ago" => "il y a plusieurs années"
+"years ago" => "il y a plusieurs années",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-\"",
+"A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
+"A valid password must be provided" => "Un mot de passe valide doit être saisi",
+"The username is already being used" => "Le nom d'utilisateur est déjà utilisé"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index cc1351c2f15..0da1695e37f 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "último mes",
 "_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
 "last year" => "último ano",
-"years ago" => "anos atrás"
+"years ago" => "anos atrás",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Só se permiten os seguintes caracteres no nome de usuario: «a-z», «A-Z», «0-9», e «_.@-»",
+"A valid username must be provided" => "Debe fornecer un nome de usuario",
+"A valid password must be provided" => "Debe fornecer un contrasinal",
+"The username is already being used" => "Este nome de usuario xa está a ser usado"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
index 6a9020009e9..27267c2e34d 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "last month" => "חודש שעבר",
 "_%n month ago_::_%n months ago_" => array("","לפני %n חודשים"),
 "last year" => "שנה שעברה",
-"years ago" => "שנים"
+"years ago" => "שנים",
+"A valid username must be provided" => "יש לספק שם משתמש תקני",
+"A valid password must be provided" => "יש לספק ססמה תקנית"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 2a03f72a51e..0637773d17c 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -60,6 +60,9 @@ $TRANSLATIONS = array(
 "last month" => "múlt hónapban",
 "_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"),
 "last year" => "tavaly",
-"years ago" => "több éve"
+"years ago" => "több éve",
+"A valid username must be provided" => "Érvényes felhasználónevet kell megadnia",
+"A valid password must be provided" => "Érvényes jelszót kell megadnia",
+"The username is already being used" => "Ez a bejelentkezési név már foglalt"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 76dda80cf70..d694967cd42 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "last month" => "bulan kemarin",
 "_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
 "last year" => "tahun kemarin",
-"years ago" => "beberapa tahun lalu"
+"years ago" => "beberapa tahun lalu",
+"A valid username must be provided" => "Tuliskan nama pengguna yang valid",
+"A valid password must be provided" => "Tuliskan sandi yang valid"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index ed1cbc2e31a..b76b5060a4d 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "mese scorso",
 "_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"),
 "last year" => "anno scorso",
-"years ago" => "anni fa"
+"years ago" => "anni fa",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Solo i seguenti caratteri sono ammessi in un nome utente: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
+"A valid username must be provided" => "Deve essere fornito un nome utente valido",
+"A valid password must be provided" => "Deve essere fornita una password valida",
+"The username is already being used" => "Il nome utente è già utilizzato"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
index 015c885904e..6d72836f775 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -66,6 +66,9 @@ $TRANSLATIONS = array(
 "last month" => "1ヶ月前",
 "_%n month ago_::_%n months ago_" => array("%nヶ月前"),
 "last year" => "1年前",
-"years ago" => "年前"
+"years ago" => "年前",
+"A valid username must be provided" => "有効なユーザー名を指定する必要があります",
+"A valid password must be provided" => "有効なパスワードを指定する必要があります",
+"The username is already being used" => "ユーザ名はすでに使われています"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/jv.php b/lib/l10n/jv.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/jv.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/ka_GE.php b/lib/l10n/ka_GE.php
index e2a719d0746..f15563c297d 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
 "last month" => "გასულ თვეში",
 "_%n month ago_::_%n months ago_" => array(""),
 "last year" => "ბოლო წელს",
-"years ago" => "წლის წინ"
+"years ago" => "წლის წინ",
+"A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
+"A valid password must be provided" => "უნდა მიუთითოთ არსებული პაროლი"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/km.php b/lib/l10n/km.php
index 51dd4f33a7e..d5fdc025760 100644
--- a/lib/l10n/km.php
+++ b/lib/l10n/km.php
@@ -39,6 +39,8 @@ $TRANSLATIONS = array(
 "last month" => "ខែមុន",
 "_%n month ago_::_%n months ago_" => array("%n ខែ​មុន"),
 "last year" => "ឆ្នាំ​មុន",
-"years ago" => "ឆ្នាំ​មុន"
+"years ago" => "ឆ្នាំ​មុន",
+"A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+"A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 833476f6464..2c94ebdcc22 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "last month" => "지난 달",
 "_%n month ago_::_%n months ago_" => array("%n달 전 "),
 "last year" => "작년",
-"years ago" => "년 전"
+"years ago" => "년 전",
+"A valid username must be provided" => "올바른 사용자 이름을 입력해야 함",
+"A valid password must be provided" => "올바른 암호를 입력해야 함"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index dac8eed7633..88aca7aba46 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "last month" => "praeitą mėnesį",
 "_%n month ago_::_%n months ago_" => array("Prieš %n mėnesį","Prieš %n mėnesius","Prieš %n mėnesių"),
 "last year" => "praeitais metais",
-"years ago" => "prieš metus"
+"years ago" => "prieš metus",
+"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
+"A valid password must be provided" => "Slaptažodis turi būti tinkamas"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 5461e077ec9..1c8a31aff2f 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -43,6 +43,9 @@ $TRANSLATIONS = array(
 "last month" => "pagājušajā mēnesī",
 "_%n month ago_::_%n months ago_" => array("","","Pirms %n mēnešiem"),
 "last year" => "gājušajā gadā",
-"years ago" => "gadus atpakaļ"
+"years ago" => "gadus atpakaļ",
+"A valid username must be provided" => "Jānorāda derīgs lietotājvārds",
+"A valid password must be provided" => "Jānorāda derīga parole",
+"The username is already being used" => "Šāds lietotājvārds jau tiek izmantots"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index deaf1bc8d05..a0b3c39865a 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -28,6 +28,8 @@ $TRANSLATIONS = array(
 "last month" => "минатиот месец",
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "минатата година",
-"years ago" => "пред години"
+"years ago" => "пред години",
+"A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
+"A valid password must be provided" => "Мора да се обезбеди валидна лозинка"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index 4b41e54ef44..fd9b631f23c 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "last month" => "forrige måned",
 "_%n month ago_::_%n months ago_" => array("","%n dager siden"),
 "last year" => "forrige år",
-"years ago" => "år siden"
+"years ago" => "år siden",
+"A valid username must be provided" => "Oppgi et gyldig brukernavn",
+"A valid password must be provided" => "Oppgi et gyldig passord"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index dcf893af630..c43703c504e 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "vorige maand",
 "_%n month ago_::_%n months ago_" => array("%n maand geleden","%n maanden geleden"),
 "last year" => "vorig jaar",
-"years ago" => "jaar geleden"
+"years ago" => "jaar geleden",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Alleen de volgende tekens zijn toegestaan in een gebruikersnaam: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
+"A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven",
+"A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
+"The username is already being used" => "De gebruikersnaam bestaat al"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index db257f35dce..77aebb26ffa 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -23,6 +23,8 @@ $TRANSLATIONS = array(
 "last month" => "førre månad",
 "_%n month ago_::_%n months ago_" => array("","%n månadar sidan"),
 "last year" => "i fjor",
-"years ago" => "år sidan"
+"years ago" => "år sidan",
+"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
+"A valid password must be provided" => "Du må oppgje eit gyldig passord"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index bc5e4a947c7..f786e1832a2 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "w zeszłym miesiącu",
 "_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
 "last year" => "w zeszłym roku",
-"years ago" => "lat temu"
+"years ago" => "lat temu",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "W nazwach użytkowników dozwolone są wyłącznie następujące znaki: \"a-z\", \"A-Z\", \"0-9\", oraz \"_.@-\"",
+"A valid username must be provided" => "Należy podać prawidłową nazwę użytkownika",
+"A valid password must be provided" => "Należy podać prawidłowe hasło",
+"The username is already being used" => "Ta nazwa użytkownika jest już używana"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/pl_PL.php b/lib/l10n/pl_PL.php
deleted file mode 100644
index 5494e3dab25..00000000000
--- a/lib/l10n/pl_PL.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "Ustawienia"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 6c8ea586de8..3cc02f76524 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "último mês",
 "_%n month ago_::_%n months ago_" => array("","ha %n meses"),
 "last year" => "último ano",
-"years ago" => "anos atrás"
+"years ago" => "anos atrás",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Somente os seguintes caracteres são permitidos no nome do usuário: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
+"A valid username must be provided" => "Forneça um nome de usuário válido",
+"A valid password must be provided" => "Forneça uma senha válida",
+"The username is already being used" => "Este nome de usuário já está sendo usado"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index e6dd459a7e1..8b3c003678d 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -61,6 +61,8 @@ $TRANSLATIONS = array(
 "last month" => "ultímo mês",
 "_%n month ago_::_%n months ago_" => array("","%n meses atrás"),
 "last year" => "ano passado",
-"years ago" => "anos atrás"
+"years ago" => "anos atrás",
+"A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
+"A valid password must be provided" => "Uma password válida deve ser fornecida"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 6bff105a61f..87e9a92c464 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -31,6 +31,8 @@ $TRANSLATIONS = array(
 "last month" => "ultima lună",
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "ultimul an",
-"years ago" => "ani în urmă"
+"years ago" => "ani în urmă",
+"A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid",
+"A valid password must be provided" => "Trebuie să furnizaţi o parolă validă"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 214849721da..2611fcf7a6b 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "last month" => "в прошлом месяце",
 "_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
 "last year" => "в прошлом году",
-"years ago" => "несколько лет назад"
+"years ago" => "несколько лет назад",
+"A valid username must be provided" => "Укажите правильное имя пользователя",
+"A valid password must be provided" => "Укажите валидный пароль"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 546e3017978..17108d4bdf6 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Aplikácia nie je zapnutá",
 "Authentication error" => "Chyba autentifikácie",
 "Token expired. Please reload page." => "Token vypršal. Obnovte, prosím, stránku.",
+"Unknown user" => "Neznámy používateľ",
 "Files" => "Súbory",
 "Text" => "Text",
 "Images" => "Obrázky",
@@ -60,6 +61,8 @@ $TRANSLATIONS = array(
 "last month" => "minulý mesiac",
 "_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"),
 "last year" => "minulý rok",
-"years ago" => "pred rokmi"
+"years ago" => "pred rokmi",
+"A valid username must be provided" => "Musíte zadať platné používateľské meno",
+"A valid password must be provided" => "Musíte zadať platné heslo"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 411a14370ee..6f9470401ed 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -66,6 +66,8 @@ $TRANSLATIONS = array(
 "last month" => "zadnji mesec",
 "_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"),
 "last year" => "lansko leto",
-"years ago" => "let nazaj"
+"years ago" => "let nazaj",
+"A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
+"A valid password must be provided" => "Navedeno mora biti veljavno geslo"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index b22663f76df..e29fa2cee53 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -41,6 +41,8 @@ $TRANSLATIONS = array(
 "last month" => "muajin e shkuar",
 "_%n month ago_::_%n months ago_" => array("","%n muaj më parë"),
 "last year" => "vitin e shkuar",
-"years ago" => "vite më parë"
+"years ago" => "vite më parë",
+"A valid username must be provided" => "Duhet të jepni një emër të vlefshëm përdoruesi",
+"A valid password must be provided" => "Duhet të jepni një fjalëkalim te vlefshëm"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index 47a84803683..f9155bfd575 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -28,6 +28,8 @@ $TRANSLATIONS = array(
 "last month" => "прошлог месеца",
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "прошле године",
-"years ago" => "година раније"
+"years ago" => "година раније",
+"A valid username must be provided" => "Морате унети исправно корисничко име",
+"A valid password must be provided" => "Морате унети исправну лозинку"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index a1f371210ac..d8d47cc9666 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Applikationen är inte aktiverad",
 "Authentication error" => "Fel vid autentisering",
 "Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
+"Unknown user" => "Okänd användare",
 "Files" => "Filer",
 "Text" => "Text",
 "Images" => "Bilder",
@@ -39,8 +40,13 @@ $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/MariaDB username and/or password not valid" => "MySQL/MariaDB användarnamn och/eller lösenord är felaktigt",
 "DB Error: \"%s\"" => "DB error: \"%s\"",
 "Offending command was: \"%s\"" => "Det felaktiga kommandot var: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB användare '%s'@'localhost' existerar redan.",
+"Drop this user from MySQL/MariaDB" => "Radera denna användare från MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB användare '%s'@'%%' existerar redan",
+"Drop this user from MySQL/MariaDB." => "Radera denna användare från MySQL/MariaDB.",
 "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",
@@ -60,6 +66,8 @@ $TRANSLATIONS = array(
 "last month" => "förra månaden",
 "_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
 "last year" => "förra året",
-"years ago" => "år sedan"
+"years ago" => "år sedan",
+"A valid username must be provided" => "Ett giltigt användarnamn måste anges",
+"A valid password must be provided" => "Ett giltigt lösenord måste anges"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 2fce8b87bf4..83dc1e0ac8c 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -53,11 +53,11 @@ $TRANSLATIONS = array(
 "PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ",
 "Set an admin username." => "Bir adi kullanici vermek. ",
 "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.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya aktarımı için düzgün bir şekilde yapılandırılmamış. WevDAV arayüzü sorunlu görünü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",
+"seconds ago" => "saniyeler önce",
 "_%n minute ago_::_%n minutes ago_" => array("","%n dakika önce"),
 "_%n hour ago_::_%n hours ago_" => array("","%n saat önce"),
 "today" => "bugün",
@@ -66,6 +66,10 @@ $TRANSLATIONS = array(
 "last month" => "geçen ay",
 "_%n month ago_::_%n months ago_" => array("","%n ay önce"),
 "last year" => "geçen yıl",
-"years ago" => "yıl önce"
+"years ago" => "yıl önce",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-\"",
+"A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
+"A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı",
+"The username is already being used" => "Bu kullanıcı adı zaten kullanımda"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php
index e2cf38ecc8c..8cfa99732ab 100644
--- a/lib/l10n/ug.php
+++ b/lib/l10n/ug.php
@@ -14,6 +14,8 @@ $TRANSLATIONS = array(
 "today" => "بۈگۈن",
 "yesterday" => "تۈنۈگۈن",
 "_%n day go_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array("")
+"_%n month ago_::_%n months ago_" => array(""),
+"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 94163f0b6f5..fed6277fdd8 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -43,6 +43,8 @@ $TRANSLATIONS = array(
 "last month" => "минулого місяця",
 "_%n month ago_::_%n months ago_" => array("","","%n місяців тому"),
 "last year" => "минулого року",
-"years ago" => "роки тому"
+"years ago" => "роки тому",
+"A valid username must be provided" => "Потрібно задати вірне ім'я користувача",
+"A valid password must be provided" => "Потрібно задати вірний пароль"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 684ee17f98e..8fca52f3dbd 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -48,6 +48,8 @@ $TRANSLATIONS = array(
 "last month" => "上月",
 "_%n month ago_::_%n months ago_" => array("%n 月前"),
 "last year" => "去年",
-"years ago" => "年前"
+"years ago" => "年前",
+"A valid username must be provided" => "必须提供合法的用户名",
+"A valid password must be provided" => "必须提供合法的密码"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 1fbae6e2355..83616cf6a42 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "last month" => "上個月",
 "_%n month ago_::_%n months ago_" => array("%n 個月前"),
 "last year" => "去年",
-"years ago" => "幾年前"
+"years ago" => "幾年前",
+"A valid username must be provided" => "必須提供一個有效的用戶名",
+"A valid password must be provided" => "一定要提供一個有效的密碼"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index cdaaebb87e5..fed6989a438 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -147,7 +147,7 @@ class AppConfig implements \OCP\IAppConfig {
 	 */
 	public function hasKey($app, $key) {
 		$values = $this->getAppValues($app);
-		return isset($values[$key]);
+		return array_key_exists($key, $values);
 	}
 
 	/**
@@ -218,8 +218,8 @@ class AppConfig implements \OCP\IAppConfig {
 	/**
 	 * get multiply values, either the app or key can be used as wildcard by setting it to false
 	 *
-	 * @param boolean $app
-	 * @param string $key
+	 * @param string|false $app
+	 * @param string|false $key
 	 * @return array
 	 */
 	public function getValues($app, $key) {
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 4821ecaf67b..78224ea54c0 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -98,7 +98,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			$dispatcher->registerMiddleware($c['SecurityMiddleware']);
 
 			foreach($middleWares as $middleWare) {
-				$dispatcher->registerMiddleware($middleWare);
+				$dispatcher->registerMiddleware($c[$middleWare]);
 			}
 
 			return $dispatcher;
@@ -133,10 +133,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 	}
 
 	/**
-	 * @param Middleware $middleWare
+	 * @param string $middleWare
 	 * @return boolean|null
 	 */
-	function registerMiddleWare(Middleware $middleWare) {
+	function registerMiddleWare($middleWare) {
 		array_push($this->middleWares, $middleWare);
 	}
 
diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php
index 35bee75cc4d..a3bbde6af53 100644
--- a/lib/private/appframework/routing/routeconfig.php
+++ b/lib/private/appframework/routing/routeconfig.php
@@ -84,7 +84,15 @@ class RouteConfig {
 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-			$this->router->create($this->appName.'.'.$controller.'.'.$action, $url)->method($verb)->action($handler);
+			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action, $url)
+							->method($verb)
+							->action($handler);
+
+			// optionally register requirements for route. This is used to 
+			// tell the route parser how url parameters should be matched
+			if(array_key_exists('requirements', $simpleRoute)) {
+				$router->requirements($simpleRoute['requirements']);
+			}
 		}
 	}
 
diff --git a/lib/private/cache.php b/lib/private/cache.php
index a311f10a00f..961270c334c 100644
--- a/lib/private/cache.php
+++ b/lib/private/cache.php
@@ -97,7 +97,7 @@ class Cache {
 
 	/**
 	 * creates cache key based on the files given
-	 * @param $files
+	 * @param string[] $files
 	 * @return string
 	 */
 	static public function generateCacheKeyFromFiles($files) {
diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php
index 8a6ef39f61b..2fd77c437fe 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');
 		}
 	}
 
@@ -83,11 +84,6 @@ class File {
 	public function hasKey($key) {
 		$storage = $this->getStorage();
 		if ($storage && $storage->is_file($key)) {
-			$mtime = $storage->filemtime($key);
-			if ($mtime < time()) {
-				$storage->unlink($key);
-				return false;
-			}
 			return true;
 		}
 		return false;
diff --git a/lib/private/config.php b/lib/private/config.php
index 56f47256134..6701ca0532b 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -172,7 +172,7 @@ class Config {
 		$result = @file_put_contents($this->configFilename, $content);
 		if (!$result) {
 			$defaults = new \OC_Defaults;
-			$url = \OC_Helper::linkToDocs('admin-dir-permissions');
+			$url = \OC_Helper::linkToDocs('admin-dir_permissions');
 			throw new HintException(
 				"Can't write into config directory!",
 				'This can usually be fixed by '
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index 0c84fa6b757..5577273df8c 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/node.php b/lib/private/connector/sabre/node.php
index 5807c5c7f71..7ff9f50ca68 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -139,12 +139,15 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 	/**
 	 * @brief Returns the last modification time, as a unix timestamp
-	 * @return int
+	 * @return int timestamp as integer
 	 */
 	public function getLastModified() {
 		$this->getFileinfoCache();
-		return $this->fileinfo_cache['mtime'];
-
+		$timestamp = $this->fileinfo_cache['mtime'];
+		if (!empty($timestamp)) {
+			return (int)$timestamp;
+		}
+		return $timestamp;
 	}
 
 	/**
diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php
index 8099794f670..227e684741c 100644
--- a/lib/private/connector/sabre/quotaplugin.php
+++ b/lib/private/connector/sabre/quotaplugin.php
@@ -56,8 +56,19 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
 				$uri='/'.$uri;
 			}
 			list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
+			$req = $this->server->httpRequest;
+			if ($req->getHeader('OC-Chunked')) {
+				$info = OC_FileChunking::decodeName($newName);
+				$chunkHandler = new OC_FileChunking($info);
+				// substract the already uploaded size to see whether
+				// there is still enough space for the remaining chunks
+				$length -= $chunkHandler->getCurrentSize();
+			}
 			$freeSpace = $this->getFreeSpace($parentUri);
 			if ($freeSpace !== \OC\Files\SPACE_UNKNOWN && $length > $freeSpace) {
+				if (isset($chunkHandler)) {
+					$chunkHandler->cleanup();
+				}
 				throw new Sabre_DAV_Exception_InsufficientStorage();
 			}
 		}
diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php
index fc6745b4505..1cb3da7098f 100644
--- a/lib/private/contactsmanager.php
+++ b/lib/private/contactsmanager.php
@@ -47,7 +47,7 @@ namespace OC {
 		 * This function can be used to delete the contact identified by the given id
 		 *
 		 * @param object $id the unique identifier to a contact
-		 * @param $address_book_key
+		 * @param string $address_book_key identifier of the address book in which the contact shall be deleted
 		 * @return bool successful or not
 		 */
 		public function delete($id, $address_book_key) {
@@ -66,7 +66,7 @@ namespace OC {
 		 * Otherwise the contact will be updated by replacing the entire data set.
 		 *
 		 * @param array $properties this array if key-value-pairs defines a contact
-		 * @param $address_book_key string to identify the address book in which the contact shall be created or updated
+		 * @param string $address_book_key identifier of the address book in which the contact shall be created or updated
 		 * @return array representing the contact just created or updated
 		 */
 		public function createOrUpdate($properties, $address_book_key) {
diff --git a/lib/private/db.php b/lib/private/db.php
index cfdac766bff..322a13642ae 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -313,9 +313,8 @@ class OC_DB {
 
 	/**
 	 * @brief Insert a row if a matching row doesn't exists.
-	 * @param string $table. The table to insert into in the form '*PREFIX*tableName'
-	 * @param array $input. An array of fieldname/value pairs
-	 * @param string $table
+	 * @param string $table The table to insert into in the form '*PREFIX*tableName'
+	 * @param array $input An array of fieldname/value pairs
 	 * @return boolean number of updated rows
 	 */
 	public static function insertIfNotExist($table, $input) {
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index eaf215c7231..492209b883b 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 79be211b82f..fca798568c5 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -29,8 +29,8 @@ class OC_Defaults {
 		$this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */
 		$this->defaultName = "ownCloud"; /* short name, used when referring to the software */
 		$this->defaultTitle = "ownCloud"; /* can be a longer name, for titles */
-		$this->defaultBaseUrl = "http://owncloud.org";
-		$this->defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
+		$this->defaultBaseUrl = "https://owncloud.org";
+		$this->defaultSyncClientUrl = "https://owncloud.org/sync-clients/";
 		$this->defaultDocBaseUrl = "http://doc.owncloud.org";
 		$this->defaultSlogan = $this->l->t("web services under your control");
 		$this->defaultLogoClaim = "";
diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php
index be7f4e14a11..1da02fc81e3 100644
--- a/lib/private/filechunking.php
+++ b/lib/private/filechunking.php
@@ -64,20 +64,46 @@ class OC_FileChunking {
 		return $parts == $this->info['chunkcount'];
 	}
 
+	/**
+	 * Assembles the chunks into the file specified by the path.
+	 * Chunks are deleted afterwards.
+	 *
+	 * @param string $f target path
+	 *
+	 * @return assembled file size
+	 *
+	 * @throws \OC\InsufficientStorageException when file could not be fully
+	 * assembled due to lack of free space
+	 */
 	public function assemble($f) {
 		$cache = $this->getCache();
 		$prefix = $this->getPrefix();
 		$count = 0;
-		for($i=0; $i < $this->info['chunkcount']; $i++) {
+		for ($i = 0; $i < $this->info['chunkcount']; $i++) {
 			$chunk = $cache->get($prefix.$i);
+			// remove after reading to directly save space
+			$cache->remove($prefix.$i);
 			$count += fwrite($f, $chunk);
 		}
 
-		$this->cleanup();
 		return $count;
 	}
 
 	/**
+	 * Returns the size of the chunks already present
+	 * @return size in bytes
+	 */
+	public function getCurrentSize() {
+		$cache = $this->getCache();
+		$prefix = $this->getPrefix();
+		$total = 0;
+		for ($i = 0; $i < $this->info['chunkcount']; $i++) {
+			$total += $cache->size($prefix.$i);
+		}
+		return $total;
+	}
+
+	/**
 	 * Removes all chunks which belong to this transmission
 	 */
 	public function cleanup() {
@@ -128,7 +154,15 @@ class OC_FileChunking {
 	}
 
 	/**
-	 * @param string $path
+	 * Assembles the chunks into the file specified by the path.
+	 * Also triggers the relevant hooks and proxies.
+	 *
+	 * @param string $path target path
+	 *
+	 * @return assembled file size or false if file could not be created
+	 *
+	 * @throws \OC\InsufficientStorageException when file could not be fully
+	 * assembled due to lack of free space
 	 */
 	public function file_assemble($path) {
 		$absolutePath = \OC\Files\Filesystem::normalizePath(\OC\Files\Filesystem::getView()->getAbsolutePath($path));
diff --git a/lib/private/files.php b/lib/private/files.php
index 7e7a27f48dc..bfe6d3c02da 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 9b18257088c..1c9de56f8c5 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) {
@@ -590,7 +594,25 @@ class Cache {
 	}
 
 	/**
+	 * get the path of a file on this storage by it's id
+	 *
+	 * @param int $id
+	 * @return string | null
+	 */
+	public function getPathById($id) {
+		$sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?';
+		$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
+		if ($row = $result->fetchRow()) {
+			return $row['path'];
+		} else {
+			return null;
+		}
+	}
+
+	/**
 	 * get the storage id of the storage for a file and the internal path of the file
+	 * unlike getPathById this does not limit the search to files on this storage and
+	 * instead does a global search in the cache table
 	 *
 	 * @param int $id
 	 * @return array, first element holding the storage id, second the path
diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php
index 82f31d0867d..2326c46e8d0 100644
--- a/lib/private/files/cache/homecache.php
+++ b/lib/private/files/cache/homecache.php
@@ -13,15 +13,21 @@ 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) {
+	public function calculateFolderSize($path, $entry = null) {
 		if ($path !== '/' and $path !== '' and $path !== 'files' and $path !== 'files_trashbin') {
-			return parent::calculateFolderSize($path);
+			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`) AS f1, ' .
@@ -45,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/scanner.php b/lib/private/files/cache/scanner.php
index 92a4c01841b..79159724d16 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 7a45b9e9e96..199ce5dee78 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/filesystem.php b/lib/private/files/filesystem.php
index 6478854eae8..7e27650c557 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');
+		}
 	}
 
 	/**
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 3c078d7b1b4..33b8549ff78 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -118,17 +118,17 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		if (!$handle) {
 			return false;
 		}
-		$size = $this->filesize($path);
-		if ($size == 0) {
-			return '';
-		}
-		return fread($handle, $size);
+		$data = stream_get_contents($handle);
+		fclose($handle);
+		return $data;
 	}
 
 	public function file_put_contents($path, $data) {
 		$handle = $this->fopen($path, "w");
 		$this->removeCachedFile($path);
-		return fwrite($handle, $data);
+		$count = fwrite($handle, $data);
+		fclose($handle);
+		return $count;
 	}
 
 	public function rename($path1, $path2) {
@@ -159,10 +159,11 @@ 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);
-		return $hash;
+		$fh = $this->fopen($path, 'rb');
+		$ctx = hash_init($type);
+		hash_update_stream($ctx, $fh);
+		fclose($fh);
+		return hash_final($ctx, $raw);
 	}
 
 	public function search($query) {
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index a62230bdba5..571bf7f97c1 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 1bab3489a28..94ee28ca763 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 32ceba8b196..a878b2c5cf6 100644
--- a/lib/private/files/storage/wrapper/quota.php
+++ b/lib/private/files/storage/wrapper/quota.php
@@ -69,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 2dbbf5b88c9..94be7114865 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,
@@ -809,6 +832,9 @@ class View {
 			$user = \OC_User::getUser();
 
 			if (!$cache->inCache($internalPath)) {
+				if (!$storage->file_exists($internalPath)) {
+					return false;
+				}
 				$scanner = $storage->getScanner($internalPath);
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 			} else {
@@ -820,7 +846,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);
@@ -1106,15 +1132,22 @@ class View {
 	 * @return string
 	 */
 	public function getPath($id) {
-		list($storage, $internalPath) = Cache\Cache::getById($id);
-		$mounts = Filesystem::getMountByStorageId($storage);
+		$manager = Filesystem::getMountManager();
+		$mounts = $manager->findIn($this->fakeRoot);
+		$mounts[] = $manager->find($this->fakeRoot);
+		// reverse the array so we start with the storage this view is in
+		// which is the most likely to contain the file we're looking for
+		$mounts = array_reverse($mounts);
 		foreach ($mounts as $mount) {
 			/**
-			 * @var \OC\Files\Mount $mount
+			 * @var \OC\Files\Mount\Mount $mount
 			 */
-			$fullPath = $mount->getMountPoint() . $internalPath;
-			if (!is_null($path = $this->getRelativePath($fullPath))) {
-				return $path;
+			$cache = $mount->getStorage()->getCache();
+			if ($internalPath = $cache->getPathById($id)) {
+				$fullPath = $mount->getMountPoint() . $internalPath;
+				if (!is_null($path = $this->getRelativePath($fullPath))) {
+					return $path;
+				}
 			}
 		}
 		return null;
diff --git a/lib/private/forbiddenexception.php b/lib/private/forbiddenexception.php
new file mode 100644
index 00000000000..14a4cd14984
--- /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 98a86388d20..da3d3cd1c6e 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);
 	}
 
 	/**
@@ -876,12 +875,15 @@ class OC_Helper {
 	 * Calculate the disc space for the given path
 	 *
 	 * @param string $path
+	 * @param \OCP\Files\FileInfo $rootInfo (optional)
 	 * @return array
 	 */
-	public static function getStorageInfo($path) {
+	public static function getStorageInfo($path, $rootInfo = null) {
 		// return storage info without adding mount points
-		$rootInfo = \OC\Files\Filesystem::getFileInfo($path, false);
-		$used = $rootInfo['size'];
+		if (is_null($rootInfo)) {
+			$rootInfo = \OC\Files\Filesystem::getFileInfo($path, false);
+		}
+		$used = $rootInfo->getSize();
 		if ($used < 0) {
 			$used = 0;
 		}
diff --git a/lib/private/image.php b/lib/private/image.php
index c987ce92c3c..f1b8acc41b7 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -34,7 +34,7 @@ class OC_Image {
 
 	/**
 	* @brief Get mime type for an image file.
-	* @param string|null $filepath The path to a local image file.
+	* @param string|null $filePath The path to a local image file.
 	* @return string The mime type if the it could be determined, otherwise an empty string.
 	*/
 	static public function getMimeTypeForFile($filePath) {
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 197b2d6791b..175360e27a3 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -75,7 +75,7 @@ class OC_L10N implements \OCP\IL10N {
 	 * get an L10N instance
 	 * @param string $app
 	 * @param string|null $lang
-	 * @return OC_L10N
+	 * @return \OC_L10N
 	 */
 	public static function get($app, $lang=null) {
 		if (is_null($lang)) {
@@ -89,7 +89,6 @@ class OC_L10N implements \OCP\IL10N {
 	 * @brief The constructor
 	 * @param string $app app requesting l10n
 	 * @param string $lang default: null Language
-	 * @returns OC_L10N-Object
 	 *
 	 * If language is not set, the constructor tries to find the right
 	 * language.
@@ -352,7 +351,7 @@ class OC_L10N implements \OCP\IL10N {
 	/**
 	 * @brief Localization
 	 * @param string $type Type of localization
-	 * @param $params parameters for this localization
+	 * @param array $data parameters for this localization
 	 * @returns String or false
 	 *
 	 * Returns the localized data.
diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php
index b6c3542a673..cb5cef7e350 100644
--- a/lib/private/legacy/appconfig.php
+++ b/lib/private/legacy/appconfig.php
@@ -116,8 +116,6 @@ class OC_Appconfig {
 	/**
 	 * get multiply values, either the app or key can be used as wildcard by setting it to false
 	 *
-	 * @param app
-	 * @param key
 	 * @param string|false $app
 	 * @param string|false $key
 	 * @return array
diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php
index ab67c8d3020..6c2103179ab 100644
--- a/lib/private/legacy/config.php
+++ b/lib/private/legacy/config.php
@@ -63,8 +63,8 @@ class OC_Config {
 	/**
 	 * @brief Gets a value from config.php
 	 * @param string $key key
-	 * @param string $default = null default value
-	 * @return string the value or $default
+	 * @param mixed $default = null default value
+	 * @return mixed the value or $default
 	 *
 	 * This function gets the value from config.php. If it does not exist,
 	 * $default will be returned.
@@ -76,7 +76,7 @@ class OC_Config {
 	/**
 	 * @brief Sets a value
 	 * @param string $key key
-	 * @param string $value value
+	 * @param mixed $value value
 	 *
 	 * This function sets the value and writes the config.php.
 	 *
diff --git a/lib/private/mail.php b/lib/private/mail.php
index 9605290fe57..f9083cc4e64 100644
--- a/lib/private/mail.php
+++ b/lib/private/mail.php
@@ -73,6 +73,7 @@ class OC_Mail {
 		$mailo->FromName = $fromname;;
 		$mailo->Sender = $fromaddress;
 		try {
+			$toaddress = self::buildAsciiEmail($toaddress);
 			$mailo->AddAddress($toaddress, $toname);
 
 			if($ccaddress<>'') $mailo->AddCC($ccaddress, $ccname);
@@ -124,7 +125,26 @@ 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) {
+		if (!function_exists('idn_to_ascii')) {
+			return $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 a216414c9dd..91bcf584267 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -77,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 06d6a8eb4b0..c8bb9425f1a 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -99,31 +99,4 @@ class OC_OCS_Cloud {
 		);
 		return new OC_OCS_Result($data);
 	}
-
-	public static function getUserPublickey($parameters) {
-
-		if(OC_User::userExists($parameters['user'])) {
-			// calculate the disc space
-			// TODO
-			return new OC_OCS_Result(array());
-		} else {
-			return new OC_OCS_Result(null, 300);
-		}
-	}
-
-	public static function getUserPrivatekey($parameters) {
-		$user = OC_User::getUser();
-		if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
-
-			if(OC_User::userExists($user)) {
-				// calculate the disc space
-				$txt = 'this is the private key of '.$parameters['user'];
-				echo($txt);
-			} else {
-				return new OC_OCS_Result(null, 300, 'User does not exist');
-			}
-		} else {
-			return new OC_OCS_Result('null', 300, 'You don´t have permission to access this ressource.');
-		}
-	}
 }
diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php
index 9f14e8da7e8..0e3b85d5905 100644
--- a/lib/private/ocs/result.php
+++ b/lib/private/ocs/result.php
@@ -96,7 +96,7 @@ class OC_OCS_Result{
 	 * @return bool
 	 */
 	public function succeeded() {
-		return (substr($this->statusCode, 0, 1) === '1');
+		return ($this->statusCode == 100);
 	}
 
 
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 0c1af3c9588..26016555a32 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -640,7 +640,7 @@ class Preview {
 	}
 
 	public static function post_write($args) {
-		self::post_delete($args);
+		self::post_delete($args, 'files/');
 	}
 
 	public static function prepare_delete_files($args) {
diff --git a/lib/private/request.php b/lib/private/request.php
index 8041c4f0048..7cbbb0676b1 100755
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -166,10 +166,11 @@ class OC_Request {
 	 */
 	public static function scriptName() {
 		$name = $_SERVER['SCRIPT_NAME'];
-		if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) {
+		$overwriteWebRoot = OC_Config::getValue('overwritewebroot', '');
+		if ($overwriteWebRoot !== '' and self::isOverwriteCondition()) {
 			$serverroot = str_replace("\\", '/', substr(__DIR__, 0, -strlen('lib/private/')));
 			$suburi = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen($serverroot)));
-			$name = OC_Config::getValue('overwritewebroot', '') . $suburi;
+			$name = '/' . ltrim($overwriteWebRoot . $suburi, '/');
 		}
 		return $name;
 	}
diff --git a/lib/private/response.php b/lib/private/response.php
index 71c538fb311..983c682bf3f 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 00000000000..ad25372391f
--- /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/router.php b/lib/private/route/router.php
index 60ba5878401..fa0ad6ab95b 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -47,6 +47,8 @@ class Router implements IRouter {
 
 	protected $loaded = false;
 
+	protected $loadedApps = array();
+
 	public function __construct() {
 		$baseUrl = \OC_Helper::linkTo('', 'index.php');
 		if (!\OC::$CLI) {
@@ -93,27 +95,46 @@ class Router implements IRouter {
 	/**
 	 * loads the api routes
 	 */
-	public function loadRoutes() {
+	public function loadRoutes($app = null) {
 		if ($this->loaded) {
 			return;
 		}
-		$this->loaded = true;
-		foreach ($this->getRoutingFiles() as $app => $file) {
-			$this->useCollection($app);
-			require_once $file;
-			$collection = $this->getCollection($app);
-			$collection->addPrefix('/apps/' . $app);
+		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);
+				$this->requireRouteFile($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);
 		}
-		$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);
 	}
 
 	/**
@@ -152,12 +173,21 @@ class Router implements IRouter {
 	}
 
 	/**
-	 * Find the route matching $url.
+	 * 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, 10) === '/settings/') {
+			$this->loadRoutes('core');
+		} else {
+			$this->loadRoutes();
+		}
 		$matcher = new UrlMatcher($this->root, $this->context);
 		$parameters = $matcher->match($url);
 		if (isset($parameters['action'])) {
@@ -196,7 +226,16 @@ class Router implements IRouter {
 	 * @return string
 	 */
 	public function generate($name, $parameters = array(), $absolute = false) {
+		$this->loadRoutes();
 		return $this->getGenerator()->generate($name, $parameters, $absolute);
 	}
 
+	/**
+	 * To isolate the variable scope used inside the $file it is required in it's own method
+	 * @param $file
+	 */
+	private function requireRouteFile($file) {
+		require_once $file;
+	}
+
 }
diff --git a/lib/private/server.php b/lib/private/server.php
index 8c9ea39c562..3517d7b3548 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -159,7 +159,15 @@ class Server extends SimpleContainer implements IServerContainer {
 			return new \OC\BackgroundJob\JobList($c->getDatabaseConnection(), $config);
 		});
 		$this->registerService('Router', function ($c){
-			$router = new \OC\Route\Router();
+			/**
+			 * @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;
 		});
 	}
@@ -294,7 +302,7 @@ class Server extends SimpleContainer implements IServerContainer {
 
 	/**
 	 * get an L10N instance
-	 * @param $app string appid
+	 * @param string $app appid
 	 * @return \OC_L10N
 	 */
 	function getL10N($app) {
@@ -327,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');
@@ -375,8 +383,6 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OCP\Route\IRouter
 	 */
 	function getRouter(){
-		$router = $this->query('Router');
-		$router->loadRoutes();
-		return $router;
+		return $this->query('Router');
 	}
 }
diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php
index a7c9e2fdefd..42ec9606dc9 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 1b9ac452575..1497c0f8928 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 fe160faa267..6f6c804f384 100644
--- a/lib/private/session/session.php
+++ b/lib/private/session/session.php
@@ -13,6 +13,11 @@ use OCP\ISession;
 abstract class Session implements \ArrayAccess, ISession {
 
 	/**
+	 * @var bool
+	 */
+	protected $sessionClosed = false;
+
+	/**
 	 * $name serves as a namespace for the session keys
 	 *
 	 * @param string $name
@@ -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 0d5bf424b33..b1061b3a25b 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();
diff --git a/lib/private/share/constants.php b/lib/private/share/constants.php
new file mode 100644
index 00000000000..7e4223d10fa
--- /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 00000000000..fde55667281
--- /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 00000000000..a33c71eedd2
--- /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 45734818731..4799db52330 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -30,7 +30,6 @@ class MailNotifications {
 
 	/**
 	 *
-	 * @param string $recipient user id
 	 * @param string $sender user id (if nothing is set we use the currently logged-in user)
 	 */
 	public function __construct($sender = null) {
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
new file mode 100644
index 00000000000..3bc07b43b4c
--- /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`, `storage`, `share_with`, `uid_owner` , `file_source`';
+			} else {
+				$select = '`id`, `parent`, `share_type`, `share_with`, `uid_owner`, `item_source`';
+			}
+		} 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 7aa0cb4a956..3d7c685c1cf 100644
--- a/lib/private/template/base.php
+++ b/lib/private/template/base.php
@@ -77,7 +77,7 @@ class Base {
 	/**
 	 * @brief Appends a variable
 	 * @param string $key key
-	 * @param string $value value
+	 * @param mixed $value value
 	 * @return boolean|null
 	 *
 	 * This function assigns a variable in an array context. If the key already
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 1354f3fd2f8..9f57aa0b6a0 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -102,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 (!\OC::$CLI && 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()))); 
diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
index 44b46ef6700..260eeb15108 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -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,12 @@ class URLGenerator implements IURLGenerator {
 	 */
 	public function getAbsoluteURL($url) {
 		$separator = $url[0] === '/' ? '' : '/';
-		return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $separator . $url;
+
+		// The ownCloud web root can already be prepended.
+		$webRoot = substr($url, 0, strlen(\OC::$WEBROOT)) === \OC::$WEBROOT
+			? ''
+			: \OC::$WEBROOT;
+
+		return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost(). $webRoot . $separator . $url;
 	}
 }
diff --git a/lib/private/user.php b/lib/private/user.php
index a89b7286c10..dc4c7ec3b61 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/user/manager.php b/lib/private/user/manager.php
index 8583a451f2d..a2ad9d17702 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -239,24 +239,25 @@ class Manager extends PublicEmitter {
 	 * @return bool | \OC\User\User the created user of false
 	 */
 	public function createUser($uid, $password) {
+		$l = \OC_L10N::get('lib');
 		// Check the name for bad characters
 		// Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
 		if (preg_match('/[^a-zA-Z0-9 _\.@\-]/', $uid)) {
-			throw new \Exception('Only the following characters are allowed in a username:'
-				. ' "a-z", "A-Z", "0-9", and "_.@-"');
+			throw new \Exception($l->t('Only the following characters are allowed in a username:'
+				. ' "a-z", "A-Z", "0-9", and "_.@-"'));
 		}
 		// No empty username
 		if (trim($uid) == '') {
-			throw new \Exception('A valid username must be provided');
+			throw new \Exception($l->t('A valid username must be provided'));
 		}
 		// No empty password
 		if (trim($password) == '') {
-			throw new \Exception('A valid password must be provided');
+			throw new \Exception($l->t('A valid password must be provided'));
 		}
 
 		// Check if user already exists
 		if ($this->userExists($uid)) {
-			throw new \Exception('The username is already being used');
+			throw new \Exception($l->t('The username is already being used'));
 		}
 
 		$this->emit('\OC\User', 'preCreateUser', array($uid, $password));
diff --git a/lib/private/util.php b/lib/private/util.php
index fc78566e456..731b7c97503 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,13 +288,19 @@ class OC_Util {
 	 * @return array arrays with error messages and hints
 	 */
 	public static function checkServer() {
+		$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);
+		}
+
 		// 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();
+			return $errors;
 		}
 
-		$errors = array();
-
 		$defaults = new \OC_Defaults();
 
 		$webServerRestart = false;
@@ -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,6 +488,8 @@ class OC_Util {
 			);
 		}
 
+		$errors = array_merge($errors, self::checkDatabaseVersion());
+
 		// Cache the result of this function
 		\OC::$session->set('checkServer_suceeded', count($errors) == 0);
 
@@ -492,6 +497,39 @@ class OC_Util {
 	}
 
 	/**
+	 * 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
 	 */
@@ -541,6 +579,25 @@ class OC_Util {
 	}
 
 	/**
+	 * 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
 	 */
 	public static function displayLoginPage($errors = array()) {
@@ -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,13 +1160,22 @@ 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
 	 * @return string the theme
diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php
index 7c2219bd046..758f0a80083 100644
--- a/lib/public/appframework/controller.php
+++ b/lib/public/appframework/controller.php
@@ -38,10 +38,10 @@ use OCP\IRequest;
 abstract class Controller {
 
 	/**
-	 * app container for dependency injection
-	 * @var \OCP\AppFramework\IAppContainer
+	 * app name
+	 * @var string
 	 */
-	protected $app;
+	protected $appName;
 
 	/**
 	 * current request
@@ -51,11 +51,11 @@ abstract class Controller {
 
 	/**
 	 * constructor of the controller
-	 * @param IAppContainer $app interface to the app
+	 * @param string $appName the name of the app
 	 * @param IRequest $request an instance of the request
 	 */
-	public function __construct(IAppContainer $app, IRequest $request){
-		$this->app = $app;
+	public function __construct($appName, IRequest $request){
+		$this->appName = $appName;
 		$this->request = $request;
 	}
 
@@ -136,7 +136,7 @@ abstract class Controller {
 	 */
 	public function render($templateName, array $params=array(),
 							$renderAs='user', array $headers=array()){
-		$response = new TemplateResponse($this->app->getAppName(), $templateName);
+		$response = new TemplateResponse($this->appName, $templateName);
 		$response->setParams($params);
 		$response->renderAs($renderAs);
 
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index b54b23a34e6..6628c4514d9 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -66,9 +66,12 @@ class JSONResponse extends Response {
 	 * Sets values in the data json array
 	 * @param array|object $data an array or object which will be transformed
 	 *                             to JSON
+	 * @return JSONResponse Reference to this object
 	 */
 	public function setData($data){
 		$this->data = $data;
+
+		return $this;
 	}
 
 
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
index d223621d4fd..45402d9b3b3 100644
--- a/lib/public/appframework/http/response.php
+++ b/lib/public/appframework/http/response.php
@@ -80,6 +80,7 @@ class Response {
 			$this->addHeader('Cache-Control', 'no-cache, must-revalidate');
 		}
 
+		return $this;
 	}
 
 
@@ -88,6 +89,7 @@ class Response {
 	 * function
 	 * @param string $name The name of the HTTP header
 	 * @param string $value The value, null will delete it
+	 * @return Response Reference to this object
 	 */
 	public function addHeader($name, $value) {
 		if(is_null($value)) {
@@ -95,6 +97,8 @@ class Response {
 		} else {
 			$this->headers[$name] = $value;
 		}
+
+		return $this;
 	}
 
 
@@ -130,9 +134,12 @@ class Response {
 	/**
 	* Set response status
 	* @param int $status a HTTP status code, see also the STATUS constants
+	* @return Response Reference to this object
 	*/
 	public function setStatus($status) {
 		$this->status = $status;
+
+		return $this;
 	}
 
 
@@ -165,18 +172,24 @@ class Response {
 	/**
 	 * Set the ETag
 	 * @param string $ETag
+	 * @return Response Reference to this object
 	 */
 	public function setETag($ETag) {
 		$this->ETag = $ETag;
+
+		return $this;
 	}
 
 
 	/**
 	 * Set "last modified" date
 	 * @param \DateTime $lastModified
+	 * @return Response Reference to this object
 	 */
 	public function setLastModified($lastModified) {
 		$this->lastModified = $lastModified;
+
+		return $this;
 	}
 
 
diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php
index 2200a38beca..f5baf788ada 100644
--- a/lib/public/appframework/http/templateresponse.php
+++ b/lib/public/appframework/http/templateresponse.php
@@ -74,9 +74,12 @@ class TemplateResponse extends Response {
 	 * Sets template parameters
 	 * @param array $params an array with key => value structure which sets template
 	 *                      variables
+	 * @return TemplateResponse Reference to this object
 	 */
 	public function setParams(array $params){
 		$this->params = $params;
+
+		return $this;
 	}
 
 
@@ -104,9 +107,12 @@ class TemplateResponse extends Response {
 	 *                         settings header and footer, user renders the normal
 	 *                         normal page including footer and header and blank
 	 *                         just renders the plain template
+	 * @return TemplateResponse Reference to this object
 	 */
 	public function renderAs($renderAs){
 		$this->renderAs = $renderAs;
+
+		return $this;
 	}
 
 
diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php
index e4f5f37cad2..a0b0c06881a 100644
--- a/lib/public/appframework/iappcontainer.php
+++ b/lib/public/appframework/iappcontainer.php
@@ -50,10 +50,10 @@ interface IAppContainer extends IContainer{
 	function getServer();
 
 	/**
-	 * @param Middleware $middleWare
+	 * @param string $middleWare
 	 * @return boolean
 	 */
-	function registerMiddleWare(Middleware $middleWare);
+	function registerMiddleWare($middleWare);
 
 	/**
 	 * @return boolean
diff --git a/lib/public/config.php b/lib/public/config.php
index bb973939f44..8e3791b449b 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -64,7 +64,7 @@ class Config {
 	public static function setSystemValue( $key, $value ) {
 		try {
 			\OC_Config::setValue( $key, $value );
-		} catch (Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 		return true;
@@ -96,7 +96,7 @@ class Config {
 	public static function setAppValue( $app, $key, $value ) {
 		try {
 			\OC_Appconfig::setValue( $app, $key, $value );
-		} catch (Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 		return true;
@@ -131,7 +131,7 @@ class Config {
 	public static function setUserValue( $user, $app, $key, $value ) {
 		try {
 			\OC_Preferences::setValue( $user, $app, $key, $value );
-		} catch (Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 		return true;
diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php
index 5b9d64ecc41..005b71f298b 100644
--- a/lib/public/contacts/imanager.php
+++ b/lib/public/contacts/imanager.php
@@ -96,7 +96,7 @@ namespace OCP\Contacts {
 		 * This function can be used to delete the contact identified by the given id
 		 *
 		 * @param object $id the unique identifier to a contact
-		 * @param   $address_book_key
+		 * @param string $address_book_key identifier of the address book in which the contact shall be deleted
 		 * @return bool successful or not
 		 */
 		function delete($id, $address_book_key);
@@ -106,7 +106,7 @@ namespace OCP\Contacts {
 		 * Otherwise the contact will be updated by replacing the entire data set.
 		 *
 		 * @param array $properties this array if key-value-pairs defines a contact
-		 * @param   $address_book_key string to identify the address book in which the contact shall be created or updated
+		 * @param string $address_book_key identifier of the address book in which the contact shall be created or updated
 		 * @return array representing the contact just created or updated
 		 */
 		function createOrUpdate($properties, $address_book_key);
diff --git a/lib/public/iappconfig.php b/lib/public/iappconfig.php
index 1f31898bf2c..2b014df2e42 100644
--- a/lib/public/iappconfig.php
+++ b/lib/public/iappconfig.php
@@ -55,9 +55,8 @@ interface IAppConfig {
 	/**
 	 * get multiply values, either the app or key can be used as wildcard by setting it to false
 	 *
-	 * @param app
-	 * @param key
-	 * @param string $key
+	 * @param string|false $key
+	 * @param string|false $app
 	 * @return array
 	 */
 	public function getValues($app, $key);
diff --git a/lib/public/il10n.php b/lib/public/il10n.php
index 1c025e7824f..1388274c21a 100644
--- a/lib/public/il10n.php
+++ b/lib/public/il10n.php
@@ -23,7 +23,7 @@ namespace OCP;
 interface IL10N {
 	/**
 	 * Translating
-	 * @param $text String The text we need a translation for
+	 * @param string $text The text we need a translation for
 	 * @param array $parameters default:array() Parameters for sprintf
 	 * @return \OC_L10N_String Translation or the same text
 	 *
@@ -34,9 +34,9 @@ interface IL10N {
 
 	/**
 	 * Translating
-	 * @param $text_singular String the string to translate for exactly one object
-	 * @param $text_plural String the string to translate for n objects
-	 * @param $count Integer Number of objects
+	 * @param string $text_singular the string to translate for exactly one object
+	 * @param string $text_plural the string to translate for n objects
+	 * @param integer $count Number of objects
 	 * @param array $parameters default:array() Parameters for sprintf
 	 * @return \OC_L10N_String Translation or the same text
 	 *
@@ -51,8 +51,8 @@ interface IL10N {
 
 	/**
 	 * Localization
-	 * @param $type Type of localization
-	 * @param $params parameters for this localization
+	 * @param string $type Type of localization
+	 * @param array $data parameters for this localization
 	 * @return String or false
 	 *
 	 * Returns the localized data.
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index dc3aff663d4..600d81d83af 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -122,7 +122,7 @@ interface IServerContainer {
 
 	/**
 	 * get an L10N instance
-	 * @param $app string appid
+	 * @param string $app appid
 	 * @return \OCP\IL10N
 	 */
 	function getL10N($app);
diff --git a/lib/public/isession.php b/lib/public/isession.php
index 20da712cda3..dc5719625cc 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/irouter.php b/lib/public/route/irouter.php
index d6b0750ba6f..125cd29e81b 100644
--- a/lib/public/route/irouter.php
+++ b/lib/public/route/irouter.php
@@ -10,8 +10,6 @@ namespace OCP\Route;
 
 interface IRouter {
 
-	public function __construct();
-
 	/**
 	 * Get the files to load the routes from
 	 *
@@ -24,7 +22,7 @@ interface IRouter {
 	/**
 	 * loads the api routes
 	 */
-	public function loadRoutes();
+	public function loadRoutes($app = null);
 
 	/**
 	 * Sets the collection to use for adding routes
diff --git a/lib/public/share.php b/lib/public/share.php
index 5066d40354d..564839e86b6 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,169 +45,33 @@ 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 $user owner of the file
-	 * @param include owner to the list of users with access to the file
+	 * @param string $user owner of the file
+	 * @param bool $includeOwner 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);
+		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,1018 +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'])) {
-					// 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'] &= ~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();
 	}
 
 	/**
@@ -1935,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);
 	}
 }
 
@@ -1967,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
@@ -1992,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
@@ -2025,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 585c5d22634..f02213f2446 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 5d360c530a9..62a3511e611 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -21,11 +21,15 @@
 *
 */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
+
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 
 try {
+	// 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();
diff --git a/public.php b/public.php
index 767295b98db..dfdd4c52af9 100644
--- a/public.php
+++ b/public.php
@@ -1,29 +1,36 @@
 <?php
-$RUNTIME_NOAPPS = true;
 
 try {
 
 	require_once 'lib/base.php';
 	OC::checkMaintenanceMode();
 	OC::checkSingleUserMode();
-	if (!isset($_GET['service'])) {
+	$pathInfo = OC_Request::getPathInfo();
+	if (!$pathInfo && !isset($_GET['service'])) {
 		header('HTTP/1.0 404 Not Found');
 		exit;
+	} elseif ($_GET['service']) {
+		$service = $_GET['service'];
+	} else {
+		$pathInfo = trim($pathInfo, '/');
+		list($service) = explode('/', $pathInfo);
 	}
-	$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service']));
-	if(is_null($file)) {
+	$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($service));
+	if (is_null($file)) {
 		header('HTTP/1.0 404 Not Found');
 		exit;
 	}
 
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
+	$parts = explode('/', $file, 2);
+	$app = $parts[0];
 
 	OC_Util::checkAppEnabled($app);
 	OC_App::loadApp($app);
 	OC_User::setIncognitoMode(true);
 
-	require_once OC_App::getAppPath($app) .'/'. $parts[1];
+	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
+
+	require_once OC_App::getAppPath($app) . '/' . $parts[1];
 
 } catch (Exception $ex) {
 	//show the user a detailed error page
diff --git a/remote.php b/remote.php
index 9e18c8f80a9..15dfa8256ff 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 f0ca5752b9a..0cc1f9d30cd 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 80b038d2ef6..e75ca940ae6 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" );
@@ -21,9 +20,7 @@ $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('sendmail_is_available', (bool) findBinaryPath('sendmailsendmail'));
 
 $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('mail_domain', OC_Config::getValue( "mail_domain", '' ));
@@ -45,6 +42,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
diff --git a/settings/admin/controller.php b/settings/admin/controller.php
index a95ede790e2..d0dcc49f297 100644
--- a/settings/admin/controller.php
+++ b/settings/admin/controller.php
@@ -106,8 +106,8 @@ class Controller {
 	/**
 	 * Get the field name to use it in error messages
 	 *
-	 * @param $setting string
-	 * @param $l \OC_L10N
+	 * @param string $setting
+	 * @param \OC_L10N $l
 	 * @return string
 	 */
 	public static function getFieldname($setting, $l) {
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
index 4782a4cfc81..d12df230d41 100644
--- a/settings/ajax/decryptall.php
+++ b/settings/ajax/decryptall.php
@@ -12,6 +12,7 @@ $params = array('uid' => \OCP\User::getUser(),
 
 $view = new OC_FilesystemView('/');
 $util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
+$l = \OC_L10N::get('settings');
 
 $result = $util->initEncryption($params);
 
@@ -27,11 +28,11 @@ if ($result !== false) {
 	$util->closeEncryptionSession();
 
 	if ($successful === true) {
-		\OCP\JSON::success(array('data' => array('message' => 'Files decrypted successfully')));
+		\OCP\JSON::success(array('data' => array('message' => $l->t('Files decrypted successfully'))));
 	} else {
-		\OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator')));
+		\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator'))));
 	}
 } else {
-	\OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, check your password and try again')));
+	\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, check your password and try again'))));
 }
 
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index b5f47bbceab..88c2bee6142 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 96b6d21b502..6fd2efc2018 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 e8c2a1943f3..9f1e7329964 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/oauth.css b/settings/css/oauth.css
deleted file mode 100644
index ccdb98cfa39..00000000000
--- a/settings/css/oauth.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.guest-container{ width:35%; margin: 2em auto 0 auto; }
-#oauth-request a.button{ float: right; }
-#oauth-request ul li{ list-style: disc; }
-#oauth-request ul { margin-left: 2em; margin-top: 1em; }
diff --git a/settings/css/settings.css b/settings/css/settings.css
index a47e7bf6563..a7680aad948 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -12,11 +12,6 @@ input#openid, input#webdav { width:20em; }
 	display: block;
 }
 
-.personalblock input[type="checkbox"] {
-	position: relative;
-	top: 2px;
-}
-
 /* Sync clients */
 .clientsbox { margin:12px; }
 .clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; }
@@ -62,13 +57,7 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point
 tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 tr:hover>td.remove>a { float:right; }
 
-li.selected,
-#leftcontent li.selected {
-	background-color: #ddd;
-}
-
 table.grid { width:100%; }
-#rightcontent { padding-left: 10px; }
 div.quota {
 	float: right;
 	display: block;
@@ -105,31 +94,21 @@ select.quota.active { background: #fff; }
 
 /* APPS */
 .appinfo { margin: 1em 40px; }
-h3 { font-size: 1.4em; font-weight: bold; }
-ul.applist a {
-	height: 2.2em;
-	padding: 0.2em 0.2em 0.2em 0.8em !important;
-}
-ul.applist .app-external {
-	width: 100%;
+#app-navigation {
+	padding-bottom: 0px;
 }
-li { color:#888; }
-li.active { color:#000; }
-#leftcontent .appwarning {
+#app-navigation .appwarning {
 	background: #fcc;
 }
-#leftcontent .appwarning:hover {
+#app-navigation.appwarning:hover {
 	background: #fbb;
 }
 small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
-small.externalapp.list { float: right; }
 small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
-small.recommendedapp.list { float: right; }
+small.externalapp.list, small.recommendedapp.list { position: absolute; right: 10px; top: 12px; }
 span.version { margin-left:1em; margin-right:1em; color:#555; }
 
-.app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ }
-.app.externalapp { max-width: 12.5em; }
-.app.recommendedapp { max-width: 12.5em; }
+
 /* Transition to complete width! */
 .app:hover, .app:active { max-width: inherit; }
 
@@ -152,7 +131,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 +145,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 88693939b84..301f50592ae 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/apps.js b/settings/js/apps.js
index 3dbc8a2f7c2..05db4c9a048 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -8,7 +8,7 @@
 OC.Settings = OC.Settings || {};
 OC.Settings.Apps = OC.Settings.Apps || {
 	loadApp:function(app) {
-		var page = $('#rightcontent');
+		var page = $('#app-content');
 		page.find('p.license').show();
 		page.find('span.name').text(app.name);
 		page.find('small.externalapp').text(app.internallabel);
@@ -82,16 +82,16 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			page.find('p.appslink').hide();
 			page.find('span.score').hide();
 		}
-		if (typeof($('#leftcontent li[data-id="'+app.id+'"]').data('errormsg')) !== "undefined") {
+		if (typeof($('#app-navigation ul li[data-id="'+app.id+'"]').data('errormsg')) !== "undefined") {
 			page.find(".warning").show();
-			page.find(".warning").text($('#leftcontent li[data-id="'+app.id+'"]').data('errormsg'));
+			page.find(".warning").text($('#app-navigation ul li[data-id="'+app.id+'"]').data('errormsg'));
 		} else {
 			page.find(".warning").hide();
 		}
 	},
 	enableApp:function(appid, active, element) {
 		console.log('enableApp:', appid, active, element);
-		var appitem=$('#leftcontent li[data-id="'+appid+'"]');
+		var appitem=$('#app-navigation ul li[data-id="'+appid+'"]');
 		element.val(t('settings','Please wait....'));
 		if(active) {
 			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
@@ -160,7 +160,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 	},
 
 	insertApp:function(appdata) {
-		var applist = $('#leftcontent li');
+		var applist = $('#app-navigation ul li');
 		var app =
 				$('<li data-id="' + appdata.id + '" data-type="external" data-installed="0">'
 				+ '<a class="app externalapp" href="' + OC.filePath('settings', 'apps', 'index.php') + '&appid=' + appdata.id+'">'
@@ -242,30 +242,30 @@ OC.Settings.Apps = OC.Settings.Apps || {
 };
 
 $(document).ready(function(){
-	$('#leftcontent li').each(function(index,li){
+	$('#app-navigation ul li').each(function(index,li){
 		var app = OC.get('appData_'+$(li).data('id'));
 		$(li).data('app',app);
 		$(this).find('span.hidden').remove();
 	});
-	$('#leftcontent li').keydown(function(event) {
+	$('#app-navigation ul li').keydown(function(event) {
 		if (event.which === 13 || event.which === 32) {
 			$(event.target).click();
 		}
 		return false;
 	});
 
-	$(document).on('click', '#leftcontent', function(event){
+	$(document).on('click', '#app-navigation', function(event){
 		var tgt = $(event.target);
 		if (tgt.is('li') || tgt.is('a')) {
 			var item = tgt.is('li') ? $(tgt) : $(tgt).parent();
 			var app = item.data('app');
 			OC.Settings.Apps.loadApp(app);
-			$('#leftcontent .selected').removeClass('selected');
+			$('#app-navigation .selected').removeClass('selected');
 			item.addClass('selected');
 		}
 		return false;
 	});
-	$('#rightcontent input.enable').click(function(){
+	$('#app-content input.enable').click(function(){
 		var element = $(this);
 		var appid=$(this).data('appid');
 		var active=$(this).data('active');
@@ -273,7 +273,7 @@ $(document).ready(function(){
 			OC.Settings.Apps.enableApp(appid, active, element);
 		}
 	});
-	$('#rightcontent input.update').click(function(){
+	$('#app-content input.update').click(function(){
 		var element = $(this);
 		var appid=$(this).data('appid');
 		if(appid) {
@@ -282,11 +282,11 @@ $(document).ready(function(){
 	});
 
 	if(appid) {
-		var item = $('#leftcontent li[data-id="'+appid+'"]');
+		var item = $('#app-navigation ul li[data-id="'+appid+'"]');
 		if(item) {
 			item.trigger('click');
 			item.addClass('active');
-			$('#leftcontent').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
+			$('#app-navigation').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
 		}
 	}
 });
diff --git a/settings/js/personal.js b/settings/js/personal.js
index f502037cfda..c1f1ef7466b 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -5,6 +5,36 @@
  * See the COPYING-README file.
  */
 
+/* global OC, t */
+
+/**
+ * The callback will be fired as soon as enter is pressed by the
+ * user or 1 second after the last data entry
+ *
+ * @param callback
+ */
+jQuery.fn.keyUpDelayedOrEnter = function(callback){
+	var cb = callback;
+	var that = this;
+	this.keyup(_.debounce(function (event) {
+		// enter is already handled in keypress
+		if(event.keyCode === 13) {
+			return;
+		}
+		if (that.val() !== '') {
+			cb();
+		}
+	}, 1000));
+
+	this.keypress(function () {
+		if (event.keyCode === 13 && that.val() !== '' ){
+			event.preventDefault();
+			cb();
+		}
+	});
+};
+
+
 /**
  * Post the email address change to the server.
  */
@@ -42,13 +72,12 @@ function changeDisplayName(){
             }
             OC.msg.finishedSaving('#displaynameform .msg', data);
         });
-        return false;
     }
 }
 
 function updateAvatar (hidedefault) {
-	$headerdiv = $('#header .avatardiv');
-	$displaydiv = $('#displayavatar .avatardiv');
+	var $headerdiv = $('#header .avatardiv');
+	var $displaydiv = $('#displayavatar .avatardiv');
 
 	if(hidedefault) {
 		$headerdiv.hide();
@@ -65,11 +94,12 @@ function updateAvatar (hidedefault) {
 }
 
 function showAvatarCropper() {
-	$cropper = $('#cropper');
+	var $cropper = $('#cropper');
 	$cropper.prepend("<img>");
-	$cropperImage = $('#cropper img');
+	var $cropperImage = $('#cropper img');
 
-	$cropperImage.attr('src', OC.generateUrl('/avatar/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(){
@@ -90,12 +120,12 @@ function showAvatarCropper() {
 function sendCropData() {
 	cleanCropper();
 
-	var cropperdata = $('#cropper').data();
+	var cropperData = $('#cropper').data();
 	var data = {
-		x: cropperdata.x,
-		y: cropperdata.y,
-		w: cropperdata.w,
-		h: cropperdata.h
+		x: cropperData.x,
+		y: cropperData.y,
+		w: cropperData.w,
+		h: cropperData.h
 	};
 	$.post(OC.generateUrl('/avatar/cropped'), {crop: data}, avatarResponseHandler);
 }
@@ -105,7 +135,7 @@ function saveCoords(c) {
 }
 
 function cleanCropper() {
-	$cropper = $('#cropper');
+	var $cropper = $('#cropper');
 	$('#displayavatar').show();
 	$cropper.hide();
 	$('.jcrop-holder').remove();
@@ -114,7 +144,7 @@ function cleanCropper() {
 }
 
 function avatarResponseHandler(data) {
-	$warning = $('#avatar .warning');
+	var $warning = $('#avatar .warning');
 	$warning.hide();
 	if (data.status === "success") {
 		updateAvatar();
@@ -157,41 +187,8 @@ $(document).ready(function(){
 
 	});
 
-    $('#displayName').keyup(function(){
-        if ($('#displayName').val() !== '' ){
-            if(typeof timeout !== 'undefined'){
-                clearTimeout(timeout);
-            }
-            timeout = setTimeout(changeDisplayName, 1000);
-        }
-    });
-
-
-    $('#email').keyup(function(event){
-        if ($('#email').val() !== '' ){
-            // if this is the enter key changeEmailAddress() is already invoked
-            // so it doesn't need to be triggered again
-            if(event.keyCode === 13) {
-                return;
-            }
-            if(typeof timeout !== 'undefined'){
-                clearTimeout(timeout);
-            }
-            timeout = setTimeout(changeEmailAddress, 1000);
-        }
-    });
-
-	$('#email').keypress(function(event){
-		// check for enter key and non empty email
-		if (event.keyCode === 13 && $('#email').val() !== '' ){
-			event.preventDefault()
-			// clear timeout of previous keyup event - prevents duplicate changeEmailAddress call
-			if(typeof timeout !== 'undefined'){
-				clearTimeout(timeout);
-			}
-			changeEmailAddress();
-		}
-	});
+	$('#displayName').keyUpDelayedOrEnter(changeDisplayName);
+	$('#email').keyUpDelayedOrEnter(changeEmailAddress);
 
 	$("#languageinput").change( function(){
 		// Serialize the data
@@ -256,7 +253,7 @@ $(document).ready(function(){
 		$.ajax({
 			type:	'DELETE',
 			url:	OC.generateUrl('/avatar/'),
-			success: function(msg) {
+			success: function() {
 				updateAvatar(true);
 				$('#removeavatar').hide();
 			}
@@ -313,7 +310,7 @@ OC.Encryption.msg={
 	startDecrypting:function(selector){
 		var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">';
 		$(selector)
-			.html( t('files_encryption', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner )
+			.html( t('settings', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner )
 			.removeClass('success')
 			.removeClass('error')
 			.stop(true, true)
@@ -321,7 +318,7 @@ OC.Encryption.msg={
 	},
 	finishedDecrypting:function(selector, data){
 		if( data.status === "success" ){
-			 $(selector).html( data.data.message )
+			$(selector).html( data.data.message )
 				.addClass('success')
 				.stop(true, true)
 				.delay(3000);
diff --git a/settings/js/users.js b/settings/js/users.js
index 284976d3bad..eef3c237277 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -226,7 +226,7 @@ var UserList = {
 		$('table+.loading').css('visibility', 'visible');
 		UserList.updating = true;
 		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad });
-		$.get(OC.generateUrl('/settings/ajax/userlist') + query, function (result) {
+		$.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) {
 			var loadedUsers = 0;
 			var trs = [];
 			if (result.status === 'success') {
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 0f2958f16ca..cdc689a211c 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,7 +1,14 @@
 <?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." => "اسمك الكامل تم تغييره.",
@@ -24,6 +31,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." => "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
 "Unable to change password" => "لا يمكن تغيير كلمة المرور",
+"Sending..." => "جاري الارسال ...",
 "User Documentation" => "كتاب توثيق المستخدم",
 "Update to {appversion}" => "تم التحديث الى ",
 "Disable" => "إيقاف",
@@ -37,6 +45,10 @@ $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." => "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
 "deleted" => "تم الحذف",
 "undo" => "تراجع",
@@ -94,7 +106,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 enforcement.",
+"Email Server" => "خادم البريد الالكتروني",
 "Server address" => "عنوان الخادم",
+"Port" => "المنفذ",
 "Log" => "سجل",
 "Log level" => "مستوى السجل",
 "More" => "المزيد",
@@ -104,6 +118,7 @@ $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>",
 "Administrator Documentation" => "كتاب توثيق المدير",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
new file mode 100644
index 00000000000..81300ed5636
--- /dev/null
+++ b/settings/l10n/ast.php
@@ -0,0 +1,18 @@
+<?php
+$TRANSLATIONS = array(
+"Email sent" => "Corréu unviáu",
+"Encryption" => "Cifráu",
+"Invalid request" => "Solicitú non válida",
+"Error" => "Fallu",
+"Groups" => "Grupos",
+"Delete" => "Desaniciar",
+"More" => "Más",
+"Less" => "Menos",
+"Password" => "Contraseña",
+"Email" => "Corréu-e",
+"Cancel" => "Encaboxar",
+"Create" => "Crear",
+"Other" => "Otru",
+"Username" => "Nome d'usuariu"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 92c5450b7dc..54fe0bbcf39 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -93,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.",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 778a05bd5e4..960938b1c68 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,9 +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 autentifikace",
+"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.",
@@ -66,6 +72,8 @@ $TRANSLATIONS = array(
 "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í",
@@ -85,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.",
@@ -105,16 +116,16 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Vynutit HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynutí připojování klientů k %s šifrovaným spojením.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL.",
-"Email Server" => "Emailový server",
-"This is used for sending out notifications." => "Toto se používá při odesílání upozornění.",
+"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" => "Ověření vyžadováno",
+"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" => "Nastavení zkušebního emailu",
+"Test email settings" => "Otestovat nastavení e-mailu",
 "Send email" => "Odeslat e-mail",
 "Log" => "Záznam",
 "Log level" => "Úroveň zaznamenávání",
@@ -146,6 +157,7 @@ $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 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ů",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 0d1308bc2d3..df8d2c419b9 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,5 +1,7 @@
 <?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",
@@ -24,7 +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",
@@ -37,6 +41,11 @@ $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. ",
 "deleted" => "Slettet",
 "undo" => "fortryd",
@@ -57,6 +66,9 @@ $TRANSLATIONS = array(
 "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.  ",
@@ -94,8 +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",
@@ -105,6 +125,7 @@ $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>",
 "Administrator Documentation" => "Administrator Dokumentation",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 5f1433f62ca..5af482b51a5 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -77,7 +77,7 @@ $TRANSLATIONS = array(
 "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.",
+"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, dass 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.",
@@ -93,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.",
@@ -144,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",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 8884afcbc3c..f79a8f174b2 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -77,7 +77,7 @@ $TRANSLATIONS = array(
 "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.",
+"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, dass 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.",
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "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, 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.",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index c438fa0f997..0b6ee6a2983 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Άκυρη τιμή για το %s",
 "Saved" => "Αποθηκεύτηκαν",
 "test email settings" => "δοκιμή ρυθμίσεων email",
 "If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
@@ -48,6 +49,7 @@ $TRANSLATIONS = array(
 "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." => "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
@@ -70,6 +72,7 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Καίρια ζητήματα μόνο",
 "None" => "Τίποτα",
 "Login" => "Σύνδεση",
+"Plain" => "Απλό",
 "NT LAN Manager" => "Διαχειριστης NT LAN",
 "SSL" => "SSL",
 "TLS" => "TLS",
@@ -90,6 +93,9 @@ $TRANSLATIONS = array(
 "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." => "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Η τελευταία εκτέλεση του cron ήταν στις %s",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Η τελευταία εκτέλεση του cron ήταν στις %s. Αυτό είναι πάνω από μια ώρα πριν, ίσως κάτι δεν πάει καλά.",
+"Cron was not executed yet!" => "Η διεργασία 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 λεπτά μέσω http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Χρήση της υπηρεσίας cron του συστήματος για να καλεστεί το αρχείο cron.php κάθε 15 λεπτά.",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 2315586b187..b377a6b3381 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -93,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.",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 734149034b9..5139b36e1b4 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -35,7 +35,7 @@ $TRANSLATIONS = array(
 "Sending..." => "Enviando...",
 "User Documentation" => "Documentación de usuario",
 "Admin Documentation" => "Documentación para administradores",
-"Update to {appversion}" => "Actualizado a {appversion}",
+"Update to {appversion}" => "Actualizar a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Espere, por favor....",
@@ -93,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.",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index c294fcc137c..677ae3d6bb6 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,7 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Sisestatud sobimatu väärtus %s jaoks",
+"Saved" => "Salvestatud",
+"test email settings" => "testi e-posti seadeid",
+"If you received this email, the settings seem to be correct." => "Kui said selle kirja, siis on seadistus korrektne.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
 "Email sent" => "E-kiri on saadetud",
+"You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
+"Send mode" => "Saatmise viis",
 "Encryption" => "Krüpteerimine",
+"Authentication method" => "Autentimise meetod",
 "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.",
@@ -24,7 +32,9 @@ $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",
+"Sending..." => "Saadan...",
 "User Documentation" => "Kasutaja dokumentatsioon",
+"Admin Documentation" => "Admin dokumentatsioon",
 "Update to {appversion}" => "Uuenda versioonile {appversion}",
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
@@ -37,6 +47,11 @@ $TRANSLATIONS = array(
 "Update" => "Uuenda",
 "Updated" => "Uuendatud",
 "Select a profile picture" => "Vali profiili pilt",
+"Very weak password" => "Väga nõrk parool",
+"Weak password" => "Nõrk parool",
+"So-so password" => "Enam-vähem sobiv parool",
+"Good password" => "Hea parool",
+"Strong password" => "Väga hea parool",
 "Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
 "deleted" => "kustutatud",
 "undo" => "tagasi",
@@ -57,6 +72,10 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Ainult tõsised probleemid",
 "None" => "Pole",
 "Login" => "Logi sisse",
+"Plain" => "Tavatekst",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "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.",
@@ -74,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Internetiühendus ei toimi",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Cron käivitati viimati %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
+"Cron was not executed yet!" => "Cron pole kordagi käivitatud!",
 "Execute one task with each page loaded" => "Käivita toiming igal lehe laadimisel",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti tagant.",
@@ -94,9 +116,17 @@ $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.",
+"Email Server" => "Postiserver",
+"This is used for sending out notifications." => "Seda kasutatakse teadete välja saatmiseks.",
+"From address" => "Saatja aadress",
+"Authentication required" => "Autentimine on vajalik",
 "Server address" => "Serveri aadress",
 "Port" => "Port",
 "Credentials" => "Kasutajatunnused",
+"SMTP Username" => "SMTP kasutajatunnus",
+"SMTP Password" => "SMTP parool",
+"Test email settings" => "Testi e-posti seadeid",
+"Send email" => "Saada kiri",
 "Log" => "Logi",
 "Log level" => "Logi tase",
 "More" => "Rohkem",
@@ -106,7 +136,9 @@ $TRANSLATIONS = array(
 "Add your App" => "Lisa oma rakendus",
 "More Apps" => "Veel rakendusi",
 "Select an App" => "Vali programm",
+"Documentation:" => "Dokumentatsioon:",
 "See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
+"See application website" => "Vaata rakendi veebilehte",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
 "Administrator Documentation" => "Administraatori dokumentatsioon",
 "Online Documentation" => "Online dokumentatsioon",
@@ -125,6 +157,7 @@ $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 and receive notifications" => "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist.",
 "Profile picture" => "Profiili pilt",
 "Upload new" => "Laadi uus üles",
 "Select new from Files" => "Vali failidest uus",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 284c47e0806..7bef4092a43 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -83,6 +83,9 @@ $TRANSLATIONS = array(
 "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",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 11c75ea1e08..5c48c7fd75f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "La connexion internet ne fonctionne pas",
 "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." => "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.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Le dernier cron s'est exécuté à %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
+"Cron was not executed yet!" => "Le cron n'a pas encore été exécuté !",
 "Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Utilise le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index d98d812d944..2d23efd96a3 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -93,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.",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 181fd11f972..12fa6d097af 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -93,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, potrebbe esserci qualche problema.",
+"Cron was not executed yet!" => "Cron non è stato ancora 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.",
diff --git a/settings/l10n/jv.php b/settings/l10n/jv.php
new file mode 100644
index 00000000000..60f6d245940
--- /dev/null
+++ b/settings/l10n/jv.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Invalid request" => "Panjalukan salah"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 40cca41638c..244881d306d 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Lagret",
 "Email sent" => "E-post sendt",
 "Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
@@ -24,6 +25,7 @@ $TRANSLATIONS = array(
 "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",
+"Sending..." => "Sender...",
 "User Documentation" => "Brukerdokumentasjon",
 "Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå avBehandle ",
@@ -37,6 +39,10 @@ $TRANSLATIONS = array(
 "Update" => "Oppdater",
 "Updated" => "Oppdatert",
 "Select a profile picture" => "Velg et profilbilde",
+"Very weak password" => "Veldig svakt passord",
+"Weak password" => "Svakt passord",
+"Good password" => "Bra passord",
+"Strong password" => "Sterkt passord",
 "Decrypting files... Please wait, this can take some time." => "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
 "deleted" => "slettet",
 "undo" => "angre",
@@ -57,6 +63,8 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Kun fatale problemer",
 "None" => "Ingen",
 "Login" => "Logg inn",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "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.",
@@ -94,8 +102,12 @@ $TRANSLATIONS = array(
 "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.",
+"From address" => "Fra adresse",
 "Server address" => "Server-adresse",
 "Port" => "Port",
+"SMTP Username" => "SMTP-brukernavn",
+"SMTP Password" => "SMTP-passord",
+"Send email" => "Send e-post",
 "Log" => "Logg",
 "Log level" => "Loggnivå",
 "More" => "Mer",
@@ -105,6 +117,7 @@ $TRANSLATIONS = array(
 "Add your App" => "Legg til din App",
 "More Apps" => "Flere Apps",
 "Select an App" => "Velg en app",
+"Documentation:" => "Dokumentasjon:",
 "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>",
 "Administrator Documentation" => "Administratordokumentasjon",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 826a6a77e00..c497eb12a68 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -93,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.",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 33b22a147dc..640e1df9585 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "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.",
diff --git a/settings/l10n/pl_PL.php b/settings/l10n/pl_PL.php
deleted file mode 100644
index 91ae517f236..00000000000
--- a/settings/l10n/pl_PL.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Update" => "Uaktualnienie",
-"Email" => "Email"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 4a7554499d5..dad6773d6af 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -93,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.",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 49f3aeeb65d..9cbdeee2c23 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Сохранено",
 "Email sent" => "Письмо отправлено",
 "Encryption" => "Шифрование",
 "Unable to load list from App Store" => "Не удалось загрузить список из App Store",
@@ -37,6 +38,11 @@ $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." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
 "deleted" => "удален",
 "undo" => "отмена",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index eaa8552f9cf..afe548a1e0d 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,7 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Uložené",
 "Email sent" => "Email odoslaný",
+"Send mode" => "Mód odosielania",
 "Encryption" => "Šifrovanie",
+"Authentication method" => "Autentifikačná metóda",
 "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é.",
@@ -24,7 +27,9 @@ $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",
+"Sending..." => "Odosielam...",
 "User Documentation" => "Príručka používateľa",
+"Admin Documentation" => "Príručka správcu",
 "Update to {appversion}" => "Aktualizovať na {appversion}",
 "Disable" => "Zakázať",
 "Enable" => "Zapnúť",
@@ -37,6 +42,11 @@ $TRANSLATIONS = array(
 "Update" => "Aktualizovať",
 "Updated" => "Aktualizované",
 "Select a profile picture" => "Vybrať avatara",
+"Very weak password" => "Veľmi slabé heslo",
+"Weak password" => "Slabé heslo",
+"So-so password" => "Priemerné heslo",
+"Good password" => "Dobré heslo",
+"Strong password" => "Silné heslo",
 "Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
 "deleted" => "zmazané",
 "undo" => "vrátiť",
@@ -57,6 +67,9 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Len fatálne problémy",
 "None" => "Žiadny",
 "Login" => "Prihlásenie",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "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.",
@@ -94,9 +107,14 @@ $TRANSLATIONS = array(
 "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.",
+"Email Server" => "Email server",
+"From address" => "Z adresy",
 "Server address" => "Adresa servera",
 "Port" => "Port",
 "Credentials" => "Prihlasovanie údaje",
+"SMTP Username" => "SMTP používateľské meno",
+"SMTP Password" => "SMTP heslo",
+"Send email" => "Odoslať email",
 "Log" => "Záznam",
 "Log level" => "Úroveň záznamu",
 "More" => "Viac",
@@ -106,7 +124,9 @@ $TRANSLATIONS = array(
 "Add your App" => "Pridať vašu aplikáciu",
 "More Apps" => "Viac aplikácií",
 "Select an App" => "Vyberte aplikáciu",
+"Documentation:" => "Dokumentácia:",
 "See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
+"See application website" => "Pozrite si webstránku aplikácie",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
 "Administrator Documentation" => "Príručka administrátora",
 "Online Documentation" => "Online príručka",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index fea2d4cc3ad..017d8a4235c 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Navedena je napačna vrednost za %s",
 "Saved" => "Shranjeno",
+"test email settings" => "preizkusi nastavitve elektronske pošte",
 "Email sent" => "Elektronska pošta je poslana",
 "Send mode" => "Način pošiljanja",
 "Encryption" => "Šifriranje",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 43695d8b28f..48f4428303c 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,9 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Ogiltigt värde gavs för %s",
+"Saved" => "Sparad",
+"test email settings" => "testa e-post inställningar",
+"If you received this email, the settings seem to be correct." => "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ett problem har uppstått under tiden e-post sändes. Vänligen se över dina inställningar.",
 "Email sent" => "E-post skickat",
+"You need to set your user email before being able to send test emails." => "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
+"Send mode" => "Sändningsläge",
 "Encryption" => "Kryptering",
+"Authentication method" => "Autentiseringsmetod",
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
 "Authentication error" => "Fel vid autentisering",
+"Your full name has been changed." => "Ditt fulla namn har ändrats",
 "Unable to change full name" => "Kunde inte ändra hela namnet",
 "Group already exists" => "Gruppen finns redan",
 "Unable to add group" => "Kan inte lägga till grupp",
@@ -23,7 +32,9 @@ $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",
+"Sending..." => "Skickar...",
 "User Documentation" => "Användardokumentation",
+"Admin Documentation" => "Administratörsdokumentation",
 "Update to {appversion}" => "Uppdatera till {appversion}",
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
@@ -36,6 +47,11 @@ $TRANSLATIONS = array(
 "Update" => "Uppdatera",
 "Updated" => "Uppdaterad",
 "Select a profile picture" => "Välj en profilbild",
+"Very weak password" => "Väldigt svagt lösenord",
+"Weak password" => "Svagt lösenord",
+"So-so password" => "Okej lösenord",
+"Good password" => "Bra lösenord",
+"Strong password" => "Starkt lösenord",
 "Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
 "deleted" => "raderad",
 "undo" => "ångra",
@@ -49,19 +65,37 @@ $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__",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Allting (allvarliga fel, fel, varningar, info, debug)",
+"Info, warnings, errors and fatal issues" => "Info, varningar och allvarliga fel",
+"Warnings, errors and fatal issues" => "Varningar, fel ocg allvarliga fel",
+"Errors and fatal issues" => "Fel och allvarliga fel",
+"Fatal issues only" => "Endast allvarliga fel",
 "None" => "Ingen",
 "Login" => "Logga in",
+"Plain" => "Enkel",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Säkerhetsvarning",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du ansluter till %s via HTTP. Vi rekommenderar starkt att du konfigurerar din server att använda HTTPS istället.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din datakatalog och dina filer är förmodligen åtkomliga från internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver så att datakatalogen inte längre är åtkomlig eller du flyttar datakatalogen utanför webbserverns rotkatalog.",
 "Setup Warning" => "Installationsvarning",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Vänligen dubbelkolla igenom <a href=\"%s\">installationsguiden</a>.",
 "Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
+"Your PHP version is outdated" => "Din PHP version är föråldrad",
+"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." => "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt.",
 "Locale not working" => "Locale fungerar inte",
+"System locale can not be set to a one which supports UTF-8." => "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
+"This means that there might be problems with certain characters in file names." => "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
 "Internet connection not working" => "Internetförbindelsen fungerar inte",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Sista cron kördes vid %s",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
+"Cron was not executed yet!" => "Cron kördes inte ännu!",
 "Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Använd systemets cron service att ropa på cron.php filen varje 15 minuter.",
@@ -82,9 +116,17 @@ $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",
+"Email Server" => "E-postserver",
+"This is used for sending out notifications." => "Detta används för att skicka ut notifieringar.",
+"From address" => "Från adress",
+"Authentication required" => "Autentisering krävs",
 "Server address" => "Serveradress",
 "Port" => "Port",
 "Credentials" => "Inloggningsuppgifter",
+"SMTP Username" => "SMTP användarnamn",
+"SMTP Password" => "SMTP lösenord",
+"Test email settings" => "Testa e-post inställninggar",
+"Send email" => "Skicka e-post",
 "Log" => "Logg",
 "Log level" => "Nivå på loggning",
 "More" => "Mer",
@@ -94,7 +136,9 @@ $TRANSLATIONS = array(
 "Add your App" => "Lägg till din applikation",
 "More Apps" => "Fler Appar",
 "Select an App" => "Välj en App",
+"Documentation:" => "Dokumentation:",
 "See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
+"See application website" => "Se applikationens webbplats",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
 "Administrator Documentation" => "Administratörsdokumentation",
 "Online Documentation" => "Onlinedokumentation",
@@ -113,17 +157,20 @@ $TRANSLATIONS = array(
 "Full Name" => "Hela namnet",
 "Email" => "E-post",
 "Your email address" => "Din e-postadress",
+"Fill in an email address to enable password recovery and receive notifications" => "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
 "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.",
+"Your avatar is provided by your original account." => "Din avatar tillhandahålls av ditt ursprungliga konto.",
 "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>",
+"The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
 "Log-in password" => "Inloggningslösenord",
 "Decrypt all Files" => "Dekryptera alla filer",
 "Login Name" => "Inloggningsnamn",
@@ -131,6 +178,7 @@ $TRANSLATIONS = array(
 "Admin Recovery Password" => "Admin återställningslösenord",
 "Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the users files during password change",
 "Default Storage" => "Förvald lagring",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
 "Unlimited" => "Obegränsad",
 "Other" => "Annat",
 "Username" => "Användarnamn",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index e02c6701a98..728e573be2f 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -78,9 +78,9 @@ $TRANSLATIONS = array(
 "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.",
+"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 belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
 "Setup Warning" => "Kurulum Uyarısı",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya aktarımı için düzgün bir şekilde yapılandırılmamış. WevDAV arayüzü sorunlu görünüyor.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin.",
 "Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
@@ -93,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.",
@@ -112,7 +115,7 @@ $TRANSLATIONS = array(
 "Security" => "Güvenlik",
 "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.",
+"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",
diff --git a/settings/personal.php b/settings/personal.php
index cf1a496bdf0..be1aa6400bf 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 6954bd3823d..a8bb0d981e8 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-/** @var $this OC_Router */
+/** @var $this OCP\Route\IRouter */
 
 // Settings pages
 $this->create('settings_help', '/settings/help')
diff --git a/settings/settings.php b/settings/settings.php
index 1e05452ec4d..c08732fcf66 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 6e816c1fff6..10f19b8891e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -43,35 +43,35 @@ if ($_['mail_smtpmode'] == 'qmail') {
 // is ssl working ?
 if (!$_['isConnectedViaHTTPS']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Security Warning'));?></h2>
 
 	<span class="securitywarning">
 		<?php p($l->t('You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.', $theme->getTitle())); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is htaccess working ?
 if (!$_['htaccessworking']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Security Warning'));?></h2>
 
 	<span class="securitywarning">
 		<?php p($l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is WebDAV working ?
 if (!$_['isWebDavWorking']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Setup Warning'));?></h2>
 
 	<span class="securitywarning">
@@ -79,42 +79,42 @@ if (!$_['isWebDavWorking']) {
 		<?php print_unescaped($l->t('Please double check the <a href="%s">installation guides</a>.', link_to_docs('admin-install'))); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // if module fileinfo available?
 if (!$_['has_fileinfo']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Module \'fileinfo\' missing'));?></h2>
 
 		<span class="connectionwarning">
 		<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is PHP at least at 5.3.8?
 if ($_['old_php']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Your PHP version is outdated'));?></h2>
 
 		<span class="connectionwarning">
 		<?php p($l->t('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.')); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is locale working ?
 if (!$_['isLocaleWorking']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Locale not working'));?></h2>
 
 		<span class="connectionwarning">
@@ -132,21 +132,21 @@ if (!$_['isLocaleWorking']) {
 			?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is internet connection working ?
 if (!$_['internetconnectionworking']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Internet connection not working'));?></h2>
 
 		<span class="connectionwarning">
 		<?php p($l->t('This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.')); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 ?>
@@ -156,8 +156,25 @@ if (!$_['internetconnectionworking']) {
 }
 ;?>
 
-<fieldset class="personalblock" id="backgroundjobs">
-	<h2><?php p($l->t('Cron'));?></h2>
+<div class="section" id="backgroundjobs">
+	<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") {
@@ -182,9 +199,9 @@ if (!$_['internetconnectionworking']) {
 				<label for="backgroundjobs_cron">Cron</label><br/>
 				<em><?php p($l->t("Use systems cron service to call the cron.php file every 15 minutes.")); ?></em>
 	</p>
-</fieldset>
+</div>
 
-<fieldset class="personalblock" id="shareAPI">
+<div class="section" id="shareAPI">
 	<h2><?php p($l->t('Sharing'));?></h2>
 	<table class="shareAPI">
 		<tr>
@@ -238,9 +255,9 @@ if (!$_['internetconnectionworking']) {
 			</td>
 		</tr>
 	</table>
-</fieldset>
+</div>
 
-<fieldset class="personalblock" id="security">
+<div class="section" id="security">
 	<h2><?php p($l->t('Security'));?></h2>
 	<table>
 		<tr>
@@ -271,9 +288,9 @@ if (!$_['internetconnectionworking']) {
 			</td>
 		</tr>
 	</table>
-</fieldset>
+</div>
 
-<fieldset id="mail_settings" class="personalblock">
+<div id="mail_settings" class="section">
 	<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>
@@ -353,9 +370,9 @@ if (!$_['internetconnectionworking']) {
 	<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>
+</div>
 
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Log'));?></h2>
 	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
 <?php for ($i = 0; $i < 5; $i++):
@@ -393,9 +410,9 @@ if (!$_['internetconnectionworking']) {
 	<input id="lessLog" type="button" value="<?php p($l->t('Less'));?>...">
 	<?php endif; ?>
 
-</fieldset>
+</div>
 
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?>
 <?php if (OC_Util::getEditionString() === ''): ?>
@@ -403,9 +420,8 @@ if (!$_['internetconnectionworking']) {
 		<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 	</p>
 <?php endif; ?>
-</fieldset>
-<fieldset class="personalblock credits-footer">
-<p>
-	<?php print_unescaped($theme->getShortFooter()); ?>
-</p>
-</fieldset>
+</div>
+
+<div class="section credits-footer">
+	<p><?php print_unescaped($theme->getShortFooter()); ?></p>
+</div>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 4c77c62f511..b7f3b6121ad 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -7,32 +7,33 @@
 	src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script>
  <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script>
 
+<div id="app-navigation">
+	<ul class="applist">
+		<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
+		<li>
+			<a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a>
+		</li>
+		<?php endif; ?>
 
-<ul id="leftcontent" class="applist">
-	<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
-	<li>
-		<a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a>
-	</li>
-	<?php endif; ?>
+		<?php foreach($_['apps'] as $app):?>
+		<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
+			<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
+				data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
+			<a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
+				href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a>
+			<?php  if(!$app['internal'])
+				print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
+		</li>
+		<?php endforeach;?>
 
-	<?php foreach($_['apps'] as $app):?>
-	<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
-		<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
-			data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
-		<a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
-			href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a>
-		<?php  if(!$app['internal'])
-			print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
-	</li>
-	<?php endforeach;?>
-
-	<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
-	<li>
-		<a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a>
-	</li>
-	<?php endif; ?>
-</ul>
-<div id="rightcontent">
+		<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
+		<li>
+			<a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a>
+		</li>
+		<?php endif; ?>
+	</ul>
+</div>
+<div id="app-content">
 	<div class="appinfo">
 	<h3><strong><span class="name"><?php p($l->t('Select an App'));?></span></strong><span
 		class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
diff --git a/settings/templates/oauth-required-apps.php b/settings/templates/oauth-required-apps.php
deleted file mode 100644
index 3660f423423..00000000000
--- a/settings/templates/oauth-required-apps.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012, Tom Needham <tom@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-?>
-<div id="oauth-request" class="guest-container">
-	<p><strong><?php print_unescaped(OC_Util::sanitizeHTML($_['consumer']['name']).'</strong> '.OC_Util::sanitizeHTML($_['message'])); ?></p>
-	<ul>
-		<?php
-		// Foreach requested scope
-		foreach($_['requiredapps'] as $requiredapp){
-			print_unescaped('<li>'.OC_Util::sanitizeHTML($requiredapp).'</li>');
-		}
-		?>
-	</ul>
-	<a href="<?php print_unescaped(OC::$WEBROOT); ?>" id="back-home" class="button">Back to ownCloud</a>
-</div>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 9024f435657..cc1fce88c9f 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -21,7 +21,7 @@
 </div>
 
 
-<div id="quota" class="personalblock">
+<div id="quota" class="section">
 	<div style="width:<?php p($_['usage_relative']);?>%;">
 		<p id="quotatext">
 			<?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>',
@@ -34,23 +34,21 @@
 <?php
 if($_['passwordChangeSupported']) {
 ?>
-<form id="passwordform">
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('Password'));?></h2>
-		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
-		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
-		<input type="password" id="pass1" name="oldpassword"
-			placeholder="<?php echo $l->t('Current password');?>"
-			autocomplete="off" autocapitalize="off" autocorrect="off" />
-		<input type="password" id="pass2" name="personal-password"
-			placeholder="<?php echo $l->t('New password');?>"
-			data-typetoggle="#personal-show"
-			autocomplete="off" autocapitalize="off" autocorrect="off" />
-		<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
-		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
-		<br/>
-		<div class="strengthify-wrapper"></div>
-	</fieldset>
+<form id="passwordform" class="section">
+	<h2><?php p($l->t('Password'));?></h2>
+	<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
+	<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
+	<input type="password" id="pass1" name="oldpassword"
+		placeholder="<?php echo $l->t('Current password');?>"
+		autocomplete="off" autocapitalize="off" autocorrect="off" />
+	<input type="password" id="pass2" name="personal-password"
+		placeholder="<?php echo $l->t('New password');?>"
+		data-typetoggle="#personal-show"
+		autocomplete="off" autocapitalize="off" autocorrect="off" />
+	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
+	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
+	<br/>
+	<div class="strengthify-wrapper"></div>
 </form>
 <?php
 }
@@ -59,15 +57,13 @@ if($_['passwordChangeSupported']) {
 <?php
 if($_['displayNameChangeSupported']) {
 ?>
-<form id="displaynameform">
-	<fieldset class="personalblock">
-		<h2><?php echo $l->t('Full Name');?></h2>
-		<input type="text" id="displayName" name="displayName"
-			value="<?php p($_['displayName'])?>"
-			autocomplete="on" autocapitalize="off" autocorrect="off" />
-        <span class="msg"></span>
-		<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />
-	</fieldset>
+<form id="displaynameform" class="section">
+	<h2><?php echo $l->t('Full Name');?></h2>
+	<input type="text" id="displayName" name="displayName"
+		value="<?php p($_['displayName'])?>"
+		autocomplete="on" autocapitalize="off" autocorrect="off" />
+    <span class="msg"></span>
+	<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />
 </form>
 <?php
 }
@@ -76,85 +72,79 @@ if($_['displayNameChangeSupported']) {
 <?php
 if($_['passwordChangeSupported']) {
 ?>
-<form id="lostpassword">
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('Email'));?></h2>
-		<input type="text" name="email" id="email" value="<?php p($_['email']); ?>"
-			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 and receive notifications'));?></em>
-	</fieldset>
+<form id="lostpassword" class="section">
+	<h2><?php p($l->t('Email'));?></h2>
+	<input type="text" name="email" id="email" value="<?php p($_['email']); ?>"
+		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 and receive notifications'));?></em>
 </form>
 <?php
 }
 ?>
 
 <?php if ($_['enableAvatars']): ?>
-<form id="avatar" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('Profile picture')); ?></h2>
-		<div id="displayavatar">
-			<div class="avatardiv"></div><br>
-			<div class="warning hidden"></div>
-			<?php if ($_['avatarChangeSupported']): ?>
-			<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
-			<input type="file" class="hidden" name="files[]" id="uploadavatar">
-			<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div>
-			<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br>
-			<?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?>
-			<?php else: ?>
-			<?php p($l->t('Your avatar is provided by your original account.')); ?>
-			<?php endif; ?>
-		</div>
-		<div id="cropper" class="hidden">
-			<div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div>
-			<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div>
-		</div>
-	</fieldset>
+<form id="avatar" class="section" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
+	<h2><?php p($l->t('Profile picture')); ?></h2>
+	<div id="displayavatar">
+		<div class="avatardiv"></div><br>
+		<div class="warning hidden"></div>
+		<?php if ($_['avatarChangeSupported']): ?>
+		<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
+		<input type="file" class="hidden" name="files[]" id="uploadavatar">
+		<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div>
+		<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br>
+		<?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?>
+		<?php else: ?>
+		<?php p($l->t('Your avatar is provided by your original account.')); ?>
+		<?php endif; ?>
+	</div>
+	<div id="cropper" class="hidden">
+		<div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div>
+		<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div>
+	</div>
 </form>
 <?php endif; ?>
 
-<form>
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('Language'));?></h2>
-		<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-			<option value="<?php p($_['activelanguage']['code']);?>">
-				<?php p($_['activelanguage']['name']);?>
+<form class="section">
+	<h2><?php p($l->t('Language'));?></h2>
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
+		<option value="<?php p($_['activelanguage']['code']);?>">
+			<?php p($_['activelanguage']['name']);?>
+		</option>
+		<?php foreach($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']);?>">
+				<?php p($language['name']);?>
 			</option>
-			<?php foreach($_['commonlanguages'] as $language):?>
-				<option value="<?php p($language['code']);?>">
-					<?php p($language['name']);?>
-				</option>
-			<?php endforeach;?>
-			<optgroup label="––––––––––"></optgroup>
-			<?php foreach($_['languages'] as $language):?>
-				<option value="<?php p($language['code']);?>">
-					<?php p($language['name']);?>
-				</option>
-			<?php endforeach;?>
-		</select>
-		<?php if (OC_Util::getEditionString() === ''): ?>
-		<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
-			target="_blank">
-			<em><?php p($l->t('Help translate'));?></em>
-		</a>
-		<?php endif; ?>
-	</fieldset>
+		<?php endforeach;?>
+		<optgroup label="––––––––––"></optgroup>
+		<?php foreach($_['languages'] as $language):?>
+			<option value="<?php p($language['code']);?>">
+				<?php p($language['name']);?>
+			</option>
+		<?php endforeach;?>
+	</select>
+	<?php if (OC_Util::getEditionString() === ''): ?>
+	<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
+		target="_blank">
+		<em><?php p($l->t('Help translate'));?></em>
+	</a>
+	<?php endif; ?>
 </form>
 
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('WebDAV'));?></h2>
 	<code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br />
 	<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em>
-</fieldset>
+</div>
 
 <?php foreach($_['forms'] as $form) {
 	print_unescaped($form);
 };?>
 
 <?php if($_['enableDecryptAll']): ?>
-<fieldset class="personalblock" id="decryptAll">
+<div class="section" id="decryptAll">
 	<h2>
 		<?php p( $l->t( 'Encryption' ) ); ?>
 	</h2>
@@ -174,18 +164,17 @@ if($_['passwordChangeSupported']) {
 		<span class="msg"></span>
 	</p>
 	<br />
-</fieldset>
+</div>
 <?php endif; ?>
 
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?><br />
 <?php if (OC_Util::getEditionString() === ''): ?>
 	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 <?php endif; ?>
-</fieldset>
-<fieldset class="personalblock credits-footer">
-<p>
-	<?php print_unescaped($theme->getShortFooter()); ?>
-</p>
-</fieldset>
+</div>
+
+<div class="section credits-footer">
+	<p><?php print_unescaped($theme->getShortFooter()); ?></p>
+</div>
diff --git a/settings/users.php b/settings/users.php
index 2f1c63a0b59..f09d0e90d3c 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 88422100f14..861eaed9cd2 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 581cfcff9f3..99374d68a5c 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);
+}
+
+require_once __DIR__ . '/../lib/base.php';
 
-if(!class_exists('PHPUnit_Framework_TestCase')) {
+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/data/lorem-big.txt b/tests/data/lorem-big.txt
new file mode 100644
index 00000000000..3712b9d30f0
--- /dev/null
+++ b/tests/data/lorem-big.txt
@@ -0,0 +1,29 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse id hendrerit felis. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed dictum dolor nec lobortis sagittis. Aliquam blandit lobortis ullamcorper. Donec malesuada ante ante, vel cursus purus suscipit ut. Sed a eros vitae lorem tristique hendrerit a a odio. Cras interdum mi lectus, sed molestie mauris tempus sit amet. Praesent auctor neque venenatis diam tincidunt sodales. Maecenas tincidunt ligula et ipsum dignissim, et molestie dui hendrerit. Nunc lobortis mauris vel tempor tristique. Sed consectetur bibendum nunc. Pellentesque augue velit, interdum ac posuere eu, eleifend et massa. Vestibulum ac mi eu mi viverra iaculis. Sed consequat leo adipiscing dui varius, sagittis vestibulum massa vehicula.
+
+Praesent imperdiet erat vitae dui placerat, sit amet vulputate tortor viverra. In laoreet elit lorem, at luctus est tempor ac. Nam elementum scelerisque nisl vitae accumsan. Curabitur cursus rutrum est, ut adipiscing ante elementum ut. Ut lectus sem, luctus ut massa non, dignissim vestibulum ipsum. Suspendisse non convallis enim, aliquam adipiscing velit. Donec pharetra non turpis hendrerit porttitor. Aliquam erat volutpat.
+
+Cras eget arcu eu dolor faucibus accumsan non eget orci. Integer quis quam tincidunt, faucibus neque in, imperdiet lacus. Aenean dui turpis, lacinia quis ligula non, semper adipiscing tellus. Curabitur vitae dui quis nisl malesuada commodo. Nunc eleifend metus enim, eu aliquet dui semper sit amet. Sed a odio sapien. Suspendisse vitae ante id sapien semper accumsan. Sed vestibulum erat quis laoreet pellentesque. Nullam placerat ligula eu odio faucibus, eget dictum orci tristique. Quisque sit amet pulvinar velit, lacinia dictum sem.
+
+Phasellus id sagittis lacus. Vivamus facilisis convallis metus, sit amet ultricies purus gravida quis. Vivamus eget egestas arcu, a euismod risus. Fusce metus arcu, molestie ut lacinia at, commodo eu nibh. In leo tortor, feugiat aliquet semper in, malesuada ac nulla. Fusce tempor ultricies blandit. Pellentesque et lorem quam. Suspendisse eros eros, mattis ut porttitor vitae, fermentum eget augue. Aliquam vitae justo sed est dictum lobortis. Cras lacinia commodo ligula sed ornare. Donec ut eros semper, sodales tellus quis, cursus quam. Quisque elementum ullamcorper pellentesque. Integer in rutrum ante, vel condimentum metus. Aliquam erat volutpat.
+
+Quisque convallis tempus eros, sit amet mattis ipsum eleifend in. Mauris volutpat, urna ut commodo tempus, est quam scelerisque erat, eget consequat nulla arcu id eros. Nam elementum nibh quis tincidunt adipiscing. Fusce tristique pretium mollis. Nulla quis ornare felis, vel lacinia diam. In et dui et mauris vestibulum commodo. In hac habitasse platea dictumst. Vestibulum viverra pellentesque tortor, tempor vehicula orci. Praesent rutrum turpis ipsum, ac commodo nisi vehicula ac.
+
+Nulla gravida ultrices mauris. Ut congue purus nec dolor euismod, vitae auctor elit condimentum. Nullam elementum velit lectus, fringilla pharetra sem hendrerit sit amet. Cras quis lobortis nisi, id interdum massa. Proin eget porttitor sapien. Vivamus quam odio, consectetur at rhoncus vel, posuere in nisi. Donec hendrerit urna ac massa tristique, pellentesque consequat orci dapibus. Mauris mi erat, aliquet id adipiscing ultricies, ultrices nec lacus. Proin imperdiet elit magna, ut suscipit metus faucibus eget. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas at leo lorem. Donec mi nibh, blandit ut mi quis, dictum adipiscing ante. Curabitur sodales blandit odio id viverra. Fusce sagittis rutrum nibh. Mauris risus lacus, placerat at dictum in, varius volutpat quam.
+
+Ut accumsan tincidunt dui, non semper lorem sodales nec. Curabitur pellentesque velit nec erat ultrices, in convallis diam suscipit. Curabitur pellentesque convallis mi. Phasellus iaculis orci quis nisi semper auctor. Vestibulum eleifend tortor quis odio feugiat, pulvinar congue turpis blandit. Sed viverra diam risus, vel mattis orci dignissim ut. Cras pellentesque dapibus dolor. Morbi tempor eleifend magna. Ut sodales ut sapien sed elementum. In hac habitasse platea dictumst.
+
+Nullam eget sagittis tellus. Donec a tellus id ligula viverra pellentesque. Pellentesque nulla turpis, pretium vel sem vel, placerat ultricies diam. Donec felis nibh, rhoncus id ornare at, lobortis vel massa. Nullam eu luctus ipsum. Mauris consequat dictum aliquam. Suspendisse ullamcorper aliquam mauris, viverra tincidunt augue suscipit at. Sed luctus scelerisque justo ut semper. Phasellus massa mauris, molestie at nulla eget, dictum ultricies nisi. Aliquam rhoncus nisl sed urna egestas, vel luctus lectus euismod. Mauris sagittis dapibus leo. Donec vitae dignissim risus, ac ultricies augue. Ut vulputate tortor sed dui consectetur placerat. Nullam viverra non diam vel dignissim.
+
+Suspendisse potenti. Integer facilisis neque vitae euismod adipiscing. Aenean dictum leo commodo dui sodales, sit amet volutpat mauris gravida. Proin tempus convallis eros at consectetur. Proin nisl purus, dictum vel euismod ut, imperdiet quis est. Etiam sollicitudin lobortis neque eget pulvinar. Etiam venenatis vel sem ut posuere. Aliquam consectetur rhoncus facilisis. Morbi a viverra orci.
+
+Praesent ut vehicula orci, vel convallis risus. Suspendisse consectetur varius interdum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Proin vel sodales enim. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur suscipit tristique justo vel dapibus. Sed tincidunt mattis massa a auctor. Donec in tincidunt elit. Curabitur interdum neque at ante fringilla tempus. In hac habitasse platea dictumst. Vivamus luctus ligula ut nisl fermentum egestas. Praesent pulvinar accumsan neque. Sed nec leo sit amet arcu vehicula vehicula non ac diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;
+
+Morbi vel arcu quis neque dictum ullamcorper. Pellentesque condimentum consequat lacinia. Vestibulum eleifend placerat erat, eu hendrerit dui pulvinar eget. Vestibulum accumsan, lectus id vehicula fringilla, erat eros dictum massa, ut tristique libero mi eu ante. In at ante nunc. Praesent sodales ullamcorper porta. Curabitur egestas odio elit. Praesent et libero malesuada, venenatis lorem vitae, eleifend nisl. Donec dapibus euismod turpis, nec porttitor turpis dapibus ac. Fusce iaculis lacus eget dictum aliquam. Sed dictum eu enim ac posuere. Ut accumsan, ipsum et laoreet consectetur, ipsum quam dapibus diam, ac molestie ligula dui id massa. Nulla aliquam mauris congue nibh vestibulum imperdiet.
+
+Aenean ultricies, orci vel consectetur suscipit, ante nisi eleifend est, vitae suscipit risus erat dictum dui. Ut nisi diam, tristique sed nisl nec, aliquam gravida orci. Vestibulum in molestie sem. Ut eu molestie mi. Suspendisse potenti. Nunc sagittis lorem ut est vehicula, vitae imperdiet leo rutrum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec pharetra urna pretium, faucibus orci cursus, sodales purus. Duis iaculis dignissim augue, non aliquet ligula elementum quis. Sed tempus a nisi et faucibus. Donec mattis ligula ac sem aliquam, sed sodales est ullamcorper. Cras vel orci est. Integer eget ultricies nisi.
+
+Quisque rhoncus, nisl vel auctor consectetur, sapien augue iaculis urna, quis suscipit arcu dolor ac est. Fusce sit amet quam lacinia, malesuada lorem vitae, dapibus justo. Mauris eget massa nec dolor volutpat tempor ut eu ante. Donec risus mi, aliquam at euismod vulputate, ullamcorper non leo. Etiam ac elit velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vivamus sollicitudin enim sed felis pharetra, a convallis mi venenatis. Donec convallis non velit venenatis suscipit. Sed massa risus, dictum quis aliquam ut, placerat quis arcu. Donec at nisi neque. Nullam porta et mi vel ultricies. Donec vel aliquam sem. Mauris varius, ipsum interdum mattis rhoncus, nunc nisl vehicula tortor, quis condimentum nibh nisl vel ante. Sed vel pretium dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce pulvinar molestie neque, quis luctus ante.
+
+Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec ac ipsum egestas, luctus urna aliquet, fringilla tortor. Cras eleifend sed tellus tempor congue. Integer venenatis magna dignissim pharetra cursus. Nulla volutpat, sem sit amet malesuada laoreet, odio libero consectetur orci, sit amet pellentesque neque ligula quis libero. Morbi nec interdum metus, in imperdiet justo. Fusce euismod egestas nulla et elementum. Etiam aliquam lectus quis eros semper, sed dapibus velit ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+
+Proin sed elit vel massa placerat mattis et vel mauris. Aliquam accumsan ante ligula, at accumsan enim pellentesque sit amet. Sed eget quam vel nunc molestie iaculis vitae nec massa. Vivamus sed accumsan libero. Duis pretium quam at blandit sollicitudin. Nullam sodales sit amet elit ac adipiscing. Ut ullamcorper dignissim sapien. Nulla facilisi. Fusce sed consequat lectus, et tempus ipsum. Aliquam vestibulum lectus vitae quam mollis, et adipiscing nisl lobortis
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 529bd31338f..ed9836ed4c3 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -167,7 +167,7 @@ module.exports = function(config) {
 		logLevel: config.LOG_INFO,
 
 		// enable / disable watching file and executing tests whenever any file changes
-		autoWatch: false,
+		autoWatch: true,
 
 		// Start these browsers, currently available:
 		// - Chrome
diff --git a/tests/lib/api.php b/tests/lib/api.php
index 233beebd68a..0f7d08543ea 100644
--- a/tests/lib/api.php
+++ b/tests/lib/api.php
@@ -37,7 +37,7 @@ class Test_API extends PHPUnit_Framework_TestCase {
 	function dataProviderTestOneResult() {
 		return array(
 			array(100, true),
-			array(101, true),
+			array(101, false),
 			array(997, false),
 		);
 	}
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index 534c54cbcee..b9b7c7d6382 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -28,6 +28,7 @@ namespace OC\AppFramework\Http;
 
 
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http;
 
 //require_once(__DIR__ . "/../classloader.php");
 
@@ -95,4 +96,13 @@ class JSONResponseTest extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals($code, $response->getStatus());
 	}
 
+	public function testChainability() {
+		$params = array('hi', 'yo');
+		$this->json->setData($params)
+			->setStatus(Http::STATUS_NOT_FOUND);
+
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $this->json->getStatus());
+		$this->assertEquals(array('hi', 'yo'), $this->json->getData());
+	}
+
 }
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index 063ab8b5d33..27350725d79 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -117,5 +117,25 @@ class ResponseTest extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('Thu, 01 Jan 1970 00:00:01 +0000', $headers['Last-Modified']);
 	}
 
+	public function testChainability() {
+		$lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
+		$lastModified->setTimestamp(1);
+
+		$this->childResponse->setEtag('hi')
+			->setStatus(Http::STATUS_NOT_FOUND)
+			->setLastModified($lastModified)
+			->cacheFor(33)
+			->addHeader('hello', 'world');
+
+		$headers = $this->childResponse->getHeaders();
+
+		$this->assertEquals('world', $headers['hello']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $this->childResponse->getStatus());
+		$this->assertEquals('hi', $this->childResponse->getEtag());
+		$this->assertEquals('Thu, 01 Jan 1970 00:00:01 +0000', $headers['Last-Modified']);
+		$this->assertEquals('max-age=33, must-revalidate',
+			$headers['Cache-Control']);
+
+	}
 
 }
diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php
index a583d9da14f..0b158edff6f 100644
--- a/tests/lib/appframework/http/TemplateResponseTest.php
+++ b/tests/lib/appframework/http/TemplateResponseTest.php
@@ -25,6 +25,7 @@
 namespace OC\AppFramework\Http;
 
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http;
 
 
 class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
@@ -98,4 +99,13 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals($render, $this->tpl->getRenderAs());
 	}
 
+	public function testChainability() {
+		$params = array('hi' => 'yo');
+		$this->tpl->setParams($params)
+			->setStatus(Http::STATUS_NOT_FOUND);
+
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $this->tpl->getStatus());
+		$this->assertEquals(array('hi' => 'yo'), $this->tpl->getParams());
+	}
+
 }
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php
index 9f2675bf0b4..261ab0b26af 100644
--- a/tests/lib/appframework/routing/RoutingTest.php
+++ b/tests/lib/appframework/routing/RoutingTest.php
@@ -36,6 +36,16 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase
 		$this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open');
 	}
 
+	public function testSimpleRouteWithRequirements()
+	{
+		$routes = array('routes' => array(
+			array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'requirements' => array('something'))
+		));
+
+		$this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', array('something'));
+	}
+
+
 	/**
 	 * @expectedException \UnexpectedValueException
 	 */
@@ -85,10 +95,10 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase
 	 * @param string $controllerName
 	 * @param string $actionName
 	 */
-	private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName)
+	private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName, array $requirements=array())
 	{
 		// route mocks
-		$route = $this->mockRoute($verb, $controllerName, $actionName);
+		$route = $this->mockRoute($verb, $controllerName, $actionName, $requirements);
 
 		// router mock
 		$router = $this->getMock("\OC\Route\Router", array('create'));
@@ -166,15 +176,15 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase
 	}
 
 	/**
-	 * @param $verb
-	 * @param $controllerName
-	 * @param $actionName
+	 * @param string $verb
+	 * @param string $controllerName
+	 * @param string $actionName
 	 * @return \PHPUnit_Framework_MockObject_MockObject
 	 */
-	private function mockRoute($verb, $controllerName, $actionName)
+	private function mockRoute($verb, $controllerName, $actionName, array $requirements=array())
 	{
 		$container = new DIContainer('app1');
-		$route = $this->getMock("\OC\Route\Route", array('method', 'action'), array(), '', false);
+		$route = $this->getMock("\OC\Route\Route", array('method', 'action', 'requirements'), array(), '', false);
 		$route
 			->expects($this->exactly(1))
 			->method('method')
@@ -186,6 +196,14 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase
 			->method('action')
 			->with($this->equalTo(new RouteActionHandler($container, $controllerName, $actionName)))
 			->will($this->returnValue($route));
+
+		if(count($requirements) > 0) {
+			$route
+				->expects($this->exactly(1))
+				->method('requirements')
+				->with($this->equalTo($requirements))
+				->will($this->returnValue($route));
+		}
 		return $route;
 	}
 
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index 11e9fcdf4fa..cfa2d6fd9aa 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -71,6 +71,9 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 		$this->assertTableNotExist($this->table2);
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function tableExist($table) {
 
 		switch (OC_Config::getValue( 'dbtype', 'sqlite' )) {
diff --git a/tests/lib/files/cache/homecache.php b/tests/lib/files/cache/homecache.php
index dbcf6e9caa0..80dc54c9d19 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 a6ee8c46661..e2fae0ae57f 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 90f1dfe581b..53f528af793 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 f9291758606..38cd17ac8c9 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,11 +112,23 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 			array('spéciäl földer'),
 		);
 	}
+
+	function loremFileProvider() {
+		$root = \OC::$SERVERROOT . '/tests/data/';
+		return array(
+			// small file
+			array($root . 'lorem.txt'),
+			// bigger file (> 8 KB which is the standard PHP block size)
+			array($root . 'lorem-big.txt')
+		);
+	}
+
 	/**
 	 * test the various uses of file_get_contents and file_put_contents
+	 *
+	 * @dataProvider loremFileProvider
 	 */
-	public function testGetPutContents() {
-		$sourceFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+	public function testGetPutContents($sourceFile) {
 		$sourceText = file_get_contents($sourceFile);
 
 		//fill a file with string data
@@ -298,4 +309,40 @@ 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));
+	}
+
+	public function testHashInFileName() {
+		$this->instance->file_put_contents('#test.txt', 'data');
+		$this->assertEquals('data', $this->instance->file_get_contents('#test.txt'));
+
+		$this->instance->mkdir('#foo');
+		$this->instance->file_put_contents('#foo/test.txt', 'data');
+		$this->assertEquals('data', $this->instance->file_get_contents('#foo/test.txt'));
+
+		$dh = $this->instance->opendir('#foo');
+		$content = array();
+		while ($file = readdir($dh)) {
+			if ($file != '.' and $file != '..') {
+				$content[] = $file;
+			}
+		}
+
+		$this->assertEquals(array('test.txt'), $content);
+	}
 }
diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php
index bd2c69a7396..777529fd85e 100644
--- a/tests/lib/files/storage/wrapper/quota.php
+++ b/tests/lib/files/storage/wrapper/quota.php
@@ -61,6 +61,24 @@ class Quota extends \Test\Files\Storage\Storage {
 		$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(
diff --git a/tests/lib/mail.php b/tests/lib/mail.php
new file mode 100644
index 00000000000..3cc9868e25e
--- /dev/null
+++ b/tests/lib/mail.php
@@ -0,0 +1,39 @@
+<?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 {
+
+	protected function setUp()
+	{
+		if (!function_exists('idn_to_ascii')) {
+			$this->markTestSkipped(
+				'The intl extension is not available.'
+			);
+		}
+	}
+
+	/**
+	 * @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/public/ocpconfig.php b/tests/lib/public/ocpconfig.php
new file mode 100644
index 00000000000..43a9ca625ee
--- /dev/null
+++ b/tests/lib/public/ocpconfig.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2014 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class Test_OCPConfig extends PHPUnit_Framework_TestCase
+{
+
+	public function testSetAppValueIfSetToNull() {
+
+		$key = uniqid("key-");
+
+		$result = \OCP\Config::setAppValue('unit-test', $key, null);
+		$this->assertTrue($result);
+
+		$result = \OCP\Config::setAppValue('unit-test', $key, '12');
+		$this->assertTrue($result);
+
+	}
+
+}
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index b5cba9430aa..aae91fa1087 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 875a7f06580..8e605d88f32 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 00000000000..155d617c4ad
--- /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 1a2ab35491b..872ff2c2596 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 71a4ff2762c..21c63ea0469 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 00000000000..808a2a2226f
--- /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 299a589ef4e..2083ffce67c 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 470aa895072..5e5fa22cf8b 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';